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:24 UTC
[maven-jxr] 03/05: Replace 1-length Strings with char when possible
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 9a4044e3bb6aa8fc26ef92c88d47abf61557ae21
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Jun 30 12:50:54 2018 +0200
Replace 1-length Strings with char when possible
---
.../org/apache/maven/plugin/jxr/JxrReportUtil.java | 4 +--
.../org/apache/maven/plugin/jxr/JxrReportTest.java | 2 +-
.../apache/maven/plugin/jxr/JxrTestReportTest.java | 2 +-
.../org/apache/maven/jxr/DirectoryIndexer.java | 4 +--
.../src/main/java/org/apache/maven/jxr/JXR.java | 2 +-
.../org/apache/maven/jxr/JavaCodeTransform.java | 37 +++++++++++-----------
.../org/apache/maven/jxr/pacman/ImportType.java | 6 ++--
.../org/apache/maven/jxr/pacman/JavaFileImpl.java | 8 ++---
8 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
index 03fecb1..d9cc4ed 100644
--- a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
+++ b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
@@ -279,7 +279,7 @@ public class JxrReportUtil
MavenProject parent = project.getParent();
while ( parent != null )
{
- hierarchy = parent.getName() + "/" + hierarchy;
+ hierarchy = parent.getName() + '/' + hierarchy;
parent = parent.getParent();
}
@@ -319,6 +319,6 @@ public class JxrReportUtil
return repository.getHost() + repository.getBasedir();
}
- return repository.getHost() + "/" + repository.getBasedir();
+ return repository.getHost() + '/' + repository.getBasedir();
}
}
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
index 5018f58..6f7689e 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
@@ -302,7 +302,7 @@ public class JxrReportTest
while ( ( strTmp = in.readLine() ) != null )
{
- str = str + " " + strTmp;
+ str = str + ' ' + strTmp;
}
in.close();
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java
index adba2da..6085e6f 100644
--- a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java
+++ b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java
@@ -94,7 +94,7 @@ public class JxrTestReportTest
while ( ( strTmp = in.readLine() ) != null )
{
- str = str + " " + strTmp;
+ str = str + ' ' + strTmp;
}
in.close();
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 09ae069..217a5cc 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
@@ -248,7 +248,7 @@ public class DirectoryIndexer
VelocityContext subContext = new VelocityContext( context );
subContext.put( "pkgInfo", pkgInfo );
- String outDir = root + "/" + (String) pkgInfo.get( "dir" );
+ String outDir = root + '/' + (String) pkgInfo.get( "dir" );
doVelocity( "package-summary", outDir, subContext, engine );
doVelocity( "package-frame", outDir, subContext, engine );
}
@@ -303,7 +303,7 @@ public class DirectoryIndexer
{
// default templates
templateFile.append( getTemplateDir() );
- templateFile.append( "/" );
+ templateFile.append( '/' );
}
templateFile.append( templateName );
templateFile.append( ".vm" );
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 9fb9be0..e5637c3 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
@@ -383,7 +383,7 @@ public class JXR
for ( int j = 0; j < i; ++j )
{
File p = parents.get( j );
- toLink.insert( 0, p.getName() + "/" );
+ toLink.insert( 0, p.getName() + '/' );
}
found = true;
break;
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 28debad..ab20bf5 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
@@ -303,7 +303,7 @@ public class JavaCodeTransform
{
out.print( this.getCurrentFilename() );
}
- out.print( " " );
+ out.print( ' ' );
}
catch ( IOException e )
{
@@ -853,7 +853,7 @@ public class JavaCodeTransform
return "";
}
StringBuilder buf = new StringBuilder();
- if ( line.indexOf( "\"" ) <= -1 )
+ if ( line.indexOf( '"' ) <= -1 )
{
return keywordFilter( line );
}
@@ -862,14 +862,14 @@ public class JavaCodeTransform
int endStringIndex = -1;
int tempIndex;
// Keep moving through String characters until we want to stop...
- while ( ( tempIndex = line.indexOf( "\"" ) ) > -1 )
+ while ( ( tempIndex = line.indexOf( '"' ) ) > -1 )
{
// We found the beginning of a string
if ( startStringIndex == -1 )
{
startStringIndex = 0;
buf.append( stringFilter( line.substring( start, tempIndex ) ) );
- buf.append( STRING_START ).append( "\"" );
+ buf.append( STRING_START ).append( '"' );
line = line.substring( tempIndex + 1 );
}
// Must be at the end
@@ -1085,8 +1085,8 @@ public class JavaCodeTransform
{
JavaFile jf = fileManager.getFile( this.getCurrentFilename() );
- javadocURI.append( StringUtils.replace( jf.getPackageType().getName(), ".", "/" ) );
- javadocURI.append( "/" );
+ javadocURI.append( jf.getPackageType().getName().replace( '.', '/' ) );
+ javadocURI.append( '/' );
// Use the name of the file instead of the class to handle inner classes properly
if ( jf.getClassType() != null && jf.getClassType().getFilename() != null )
{
@@ -1202,7 +1202,7 @@ public class JavaCodeTransform
String wordName = word.toString();
- if ( wordName.indexOf( "." ) != -1 )
+ if ( wordName.indexOf( '.' ) != -1 )
{
// if there is a "." in the string then we have to assume
// it is a package.
@@ -1210,8 +1210,8 @@ public class JavaCodeTransform
String fqpnPackage = null;
String fqpnClass = null;
- fqpnPackage = wordName.substring( 0, wordName.lastIndexOf( "." ) );
- fqpnClass = wordName.substring( wordName.lastIndexOf( "." ) + 1, wordName.length() );
+ fqpnPackage = wordName.substring( 0, wordName.lastIndexOf( '.' ) );
+ fqpnClass = wordName.substring( wordName.lastIndexOf( '.' ) + 1, wordName.length() );
// note. since this is a reference to a full package then
// it doesn't have to be explicitly imported so this information
@@ -1266,18 +1266,17 @@ public class JavaCodeTransform
href.append( this.getPackageRoot() );
// now find out how to get to the dest package
- dest = StringUtils.replace( dest, ".*", "" );
- dest = StringUtils.replace( dest, ".", "/" );
+ dest = StringUtils.replace( dest, ".*", "" ).replace( '.', '/' );
href.append( dest );
// Now append filename.html
if ( jc != null )
{
- href.append( "/" );
+ href.append( '/' );
href.append( jc.getFilename() );
href.append( ".html" );
- href.append('#');
+ href.append( '#' );
href.append( jc.getName() );
}
@@ -1354,7 +1353,7 @@ public class JavaCodeTransform
if ( isImport || isPackage )
{
- start = line.trim().indexOf( " " );
+ start = line.trim().indexOf( ' ' );
}
if ( start != -1 )
@@ -1383,14 +1382,14 @@ public class JavaCodeTransform
// This breaks Jxr and won't be a problem when we hook
// in the real parser.
- int a = packageLine.lastIndexOf( "." ) + 1;
+ int a = packageLine.lastIndexOf( '.' ) + 1;
int b = packageLine.length() - 1;
if ( a > b + 1 )
{
- classname = packageLine.substring( packageLine.lastIndexOf( "." ) + 1, packageLine.length() - 1 );
+ classname = packageLine.substring( packageLine.lastIndexOf( '.' ) + 1, packageLine.length() - 1 );
- int end = pkg.lastIndexOf( "." );
+ int end = pkg.lastIndexOf( '.' );
if ( end == -1 )
{
end = pkg.length() - 1;
@@ -1410,13 +1409,13 @@ public class JavaCodeTransform
if ( classname != null )
{
line =
- StringUtils.replace( line, classname, "<a href=\"" + pkgHREF + "/" + classname + ".html"
+ StringUtils.replace( line, classname, "<a href=\"" + pkgHREF + '/' + classname + ".html"
+ "\">" + classname + "</a>" );
}
// now replace the given package with a href
line =
- StringUtils.replace( line, pkg, "<a href=\"" + pkgHREF + "/" + DirectoryIndexer.INDEX + "\">" + pkg
+ StringUtils.replace( line, pkg, "<a href=\"" + pkgHREF + '/' + DirectoryIndexer.INDEX + "\">" + pkg
+ "</a>" );
}
diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/ImportType.java b/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/ImportType.java
index e8696ce..a8abf53 100644
--- a/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/ImportType.java
+++ b/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/ImportType.java
@@ -43,11 +43,11 @@ public class ImportType
//compute member variables
- this.isclass = this.getName().indexOf( "*" ) == -1;
+ this.isclass = this.getName().indexOf( '*' ) == -1;
- this.ispackage = this.getName().indexOf( "*" ) != -1;
+ this.ispackage = this.getName().indexOf( '*' ) != -1;
- int end = this.getName().lastIndexOf( "." );
+ int end = this.getName().lastIndexOf( '.' );
if ( end != -1 )
{
this.packagename = this.getName().substring( 0, end );
diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFileImpl.java b/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFileImpl.java
index 4929c40..89b9014 100644
--- a/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFileImpl.java
+++ b/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFileImpl.java
@@ -19,8 +19,6 @@ package org.apache.maven.jxr.pacman;
* under the License.
*/
-import org.codehaus.plexus.util.StringUtils;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
@@ -107,7 +105,7 @@ public class JavaFileImpl
*/
if ( name.charAt( name.length() - 1 ) == '.' )
{
- name = name + "*";
+ name = name + '*';
}
this.addImportType( new ImportType( name ) );
@@ -153,8 +151,8 @@ public class JavaFileImpl
}
// Remove the path, after unifying path separators
- newFilename = StringUtils.replace( newFilename, "\\", "/" );
- int pathIndex = newFilename.lastIndexOf( "/" );
+ newFilename = newFilename.replace( '\\', '/' );
+ int pathIndex = newFilename.lastIndexOf( '/' );
if ( pathIndex == -1 )
{
return newFilename;