From 2d5fa22ca4f54916e754db17c87971dc409570f7 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 30 Jan 2013 10:10:20 +0100 Subject: [PATCH] use index of char instead of index of string, if possible --- .../src/main/java/sonia/scm/maven/PackageMojo.java | 2 +- .../src/main/java/sonia/scm/io/INIConfigurationReader.java | 2 +- scm-core/src/main/java/sonia/scm/net/Proxies.java | 2 +- scm-core/src/main/java/sonia/scm/plugin/PluginVersion.java | 2 +- scm-core/src/main/java/sonia/scm/repository/Person.java | 4 ++-- scm-core/src/main/java/sonia/scm/url/UrlUtil.java | 2 +- scm-core/src/main/java/sonia/scm/util/HttpUtil.java | 2 +- scm-core/src/main/java/sonia/scm/util/RegistryUtil.java | 2 +- scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java | 2 +- .../sonia/scm/repository/spi/javahg/HgFileviewCommand.java | 2 +- .../java/sonia/scm/api/rest/resources/RepositoryResource.java | 2 +- .../src/main/java/sonia/scm/plugin/DefaultPluginLoader.java | 2 +- .../src/main/java/sonia/scm/plugin/DefaultPluginManager.java | 2 +- .../src/main/java/sonia/scm/template/TemplateServlet.java | 2 +- .../src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java | 2 +- scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/PackageMojo.java b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/PackageMojo.java index 4f0a2c83f1..fa449fda37 100644 --- a/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/PackageMojo.java +++ b/maven/scm-maven-plugin/src/main/java/sonia/scm/maven/PackageMojo.java @@ -340,7 +340,7 @@ public class PackageMojo extends AbstractBaseScmMojo if (resolveMetadata) { String path = localRepository.pathOf(artifact); - int lastIndex = path.lastIndexOf("."); + int lastIndex = path.lastIndexOf('.'); if (lastIndex > 0) { diff --git a/scm-core/src/main/java/sonia/scm/io/INIConfigurationReader.java b/scm-core/src/main/java/sonia/scm/io/INIConfigurationReader.java index 70839540d3..919e64e23e 100644 --- a/scm-core/src/main/java/sonia/scm/io/INIConfigurationReader.java +++ b/scm-core/src/main/java/sonia/scm/io/INIConfigurationReader.java @@ -101,7 +101,7 @@ public class INIConfigurationReader extends AbstractReader else if ((section != null) &&!line.startsWith(";") &&!line.startsWith("#")) { - int index = line.indexOf("="); + int index = line.indexOf('='); if (index > 0) { diff --git a/scm-core/src/main/java/sonia/scm/net/Proxies.java b/scm-core/src/main/java/sonia/scm/net/Proxies.java index 244102ace6..1b4b47ec80 100644 --- a/scm-core/src/main/java/sonia/scm/net/Proxies.java +++ b/scm-core/src/main/java/sonia/scm/net/Proxies.java @@ -84,7 +84,7 @@ public class Proxies url = url.substring(index + 3); } - index = url.indexOf("/"); + index = url.indexOf('/'); if (index > 0) { diff --git a/scm-core/src/main/java/sonia/scm/plugin/PluginVersion.java b/scm-core/src/main/java/sonia/scm/plugin/PluginVersion.java index 3120084630..01ffe67e99 100644 --- a/scm-core/src/main/java/sonia/scm/plugin/PluginVersion.java +++ b/scm-core/src/main/java/sonia/scm/plugin/PluginVersion.java @@ -68,7 +68,7 @@ public class PluginVersion implements Comparable { this.unparsedVersion = versionString; - int index = versionString.indexOf("-"); + int index = versionString.indexOf('-'); String versionPart = null; String qualifierPart = null; diff --git a/scm-core/src/main/java/sonia/scm/repository/Person.java b/scm-core/src/main/java/sonia/scm/repository/Person.java index 29ea5b3d5b..b3bf15c49a 100644 --- a/scm-core/src/main/java/sonia/scm/repository/Person.java +++ b/scm-core/src/main/java/sonia/scm/repository/Person.java @@ -115,8 +115,8 @@ public class Person implements Validateable, Serializable { String name = value; String mail = null; - int s = value.indexOf("<"); - int e = value.indexOf(">"); + int s = value.indexOf('<'); + int e = value.indexOf('>'); if ((s > 0) && (e > 0)) { diff --git a/scm-core/src/main/java/sonia/scm/url/UrlUtil.java b/scm-core/src/main/java/sonia/scm/url/UrlUtil.java index 4ac039afc1..a46b9252f4 100644 --- a/scm-core/src/main/java/sonia/scm/url/UrlUtil.java +++ b/scm-core/src/main/java/sonia/scm/url/UrlUtil.java @@ -59,7 +59,7 @@ public class UrlUtil if (Util.isNotEmpty(revision)) { - int index = revision.indexOf(":"); + int index = revision.indexOf(':'); if (index > 0) { diff --git a/scm-core/src/main/java/sonia/scm/util/HttpUtil.java b/scm-core/src/main/java/sonia/scm/util/HttpUtil.java index 2d7d5ac9ba..9be8522691 100644 --- a/scm-core/src/main/java/sonia/scm/util/HttpUtil.java +++ b/scm-core/src/main/java/sonia/scm/util/HttpUtil.java @@ -331,7 +331,7 @@ public class HttpUtil */ public static String removeMatrixParameter(String uri) { - int index = uri.indexOf(";"); + int index = uri.indexOf(';'); if (index > 0) { diff --git a/scm-core/src/main/java/sonia/scm/util/RegistryUtil.java b/scm-core/src/main/java/sonia/scm/util/RegistryUtil.java index 667d120f21..7e787c042c 100644 --- a/scm-core/src/main/java/sonia/scm/util/RegistryUtil.java +++ b/scm-core/src/main/java/sonia/scm/util/RegistryUtil.java @@ -133,7 +133,7 @@ public class RegistryUtil if (value.startsWith("\"")) { value = value.substring(1); - value = value.substring(0, value.indexOf("\"")); + value = value.substring(0, value.indexOf('"')); } if (logger.isDebugEnabled()) diff --git a/scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java b/scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java index 9554aab8e1..a1f4193d28 100644 --- a/scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java +++ b/scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java @@ -217,7 +217,7 @@ public class CGIRunner // into exec here... String execCmd = path; - if ((execCmd.charAt(0) != '"') && (execCmd.indexOf(" ") >= 0)) + if ((execCmd.charAt(0) != '"') && (execCmd.indexOf(' ') >= 0)) { execCmd = "\"" + execCmd + "\""; } diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java index 59509e1e65..74695217d2 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java @@ -332,7 +332,7 @@ public class HgFileviewCommand extends AbstractCommand */ private String getNameFromPath(String path) { - int index = path.lastIndexOf("/"); + int index = path.lastIndexOf('/'); if (index > 0) { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java index 494eab42fa..ca53cac312 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java @@ -1089,7 +1089,7 @@ public class RepositoryResource private String getContentDispositionNameFromPath(String path) { String name = path; - int index = path.lastIndexOf("/"); + int index = path.lastIndexOf('/'); if (index >= 0) { diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java index 62388e3454..2d8e3fbc07 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java @@ -299,7 +299,7 @@ public class DefaultPluginLoader implements PluginLoader { // jar:file:/some/path/file.jar!/META-INF/scm/plugin.xml - path = path.substring("jar:file:".length(), path.lastIndexOf("!")); + path = path.substring("jar:file:".length(), path.lastIndexOf('!')); path = decodePath(path); } diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java index 5a2d2442d1..4e75d5b84d 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java @@ -673,7 +673,7 @@ public class DefaultPluginManager */ private String getPluginIdPrefix(String pluginId) { - return pluginId.substring(0, pluginId.lastIndexOf(":")); + return pluginId.substring(0, pluginId.lastIndexOf(':')); } /** diff --git a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java index 6f083fdf38..4750361d15 100644 --- a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java @@ -156,7 +156,7 @@ public class TemplateServlet extends HttpServlet params.put("locale", locale); String country = locale; - int i = country.indexOf("_"); + int i = country.indexOf('_'); if (i > 0) { diff --git a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java index 1d25a5bcce..1841de094b 100644 --- a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java +++ b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java @@ -158,7 +158,7 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor String execCmd = path; - if ((execCmd.charAt(0) != '"') && (execCmd.indexOf(" ") >= 0)) + if ((execCmd.charAt(0) != '"') && (execCmd.indexOf(' ') >= 0)) { execCmd = "\"".concat(execCmd).concat("\""); } diff --git a/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java b/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java index dc1925e5ab..54bb5b9b1a 100644 --- a/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java +++ b/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java @@ -50,7 +50,7 @@ import static org.junit.Assert.*; */ public class EhCacheTest { - + /** * Method description *