java/code/src/com/redhat/rhn/common/conf/Config.java | 2 +- java/code/src/com/redhat/rhn/common/localization/LocalizationService.java | 2 +- java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java | 2 +- java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java | 4 ++-- java/code/src/com/redhat/rhn/common/util/CSVWriter.java | 4 ++-- java/code/src/com/redhat/rhn/common/util/MD5Crypt.java | 2 +- java/code/src/com/redhat/rhn/common/util/StringUtil.java | 2 +- java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 2 +- java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java | 4 ++-- java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java | 2 +- java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2 +- java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java | 2 +- java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit e6124e2a2c112ecf5b74921c1a8e283d1846cba8 Author: Matej Kollar mkollar@redhat.com Date: Thu Jan 9 17:30:54 2014 +0100
String.indexOf(char) is faster than String.indexOf(String).
At least PMD sais so...
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java index 781839d..00dc300 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -189,7 +189,7 @@ public class Config { return null; }
- int lastDot = value.lastIndexOf("."); + int lastDot = value.lastIndexOf('.'); String ns = ""; String property = value; if (lastDot > 0) { diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java index da664e5..19568a1 100644 --- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java +++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java @@ -140,7 +140,7 @@ public class LocalizationService { for (Enumeration locales = new StringTokenizer(rawLocales, ","); locales .hasMoreElements();) { String locale = (String) locales.nextElement(); - if (locale.indexOf("_") > -1) { + if (locale.indexOf('_') > -1) { compoundLocales.add(locale); } LocaleInfo li = new LocaleInfo(locale); diff --git a/java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java b/java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java index 5473231..3ae14e1 100644 --- a/java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java +++ b/java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java @@ -271,7 +271,7 @@ public class SmtpMail implements Mail { log.debug("verifyAddress called ..."); boolean retval = true; String domain = addr.getAddress(); - int domainStart = domain.indexOf("@"); + int domainStart = domain.indexOf('@'); if (domainStart > -1 && domainStart + 1 < domain.length()) { domain = domain.substring(domainStart + 1);
diff --git a/java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java b/java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java index b2627d3..8c3ebbb 100644 --- a/java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java +++ b/java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java @@ -70,8 +70,8 @@ public class SqlExceptionTranslator extends Translations { String msg = e.getMessage(); switch(code) { case 1: - int ind = msg.indexOf("(") + 1; - String desc = msg.substring(ind, msg.indexOf(")", ind)); + int ind = msg.indexOf('(') + 1; + String desc = msg.substring(ind, msg.indexOf(')', ind)); return new ConstraintViolationException( ExceptionConstants.VALUE_TOO_LARGE, desc, msg, e); case 1401: diff --git a/java/code/src/com/redhat/rhn/common/util/CSVWriter.java b/java/code/src/com/redhat/rhn/common/util/CSVWriter.java index f1e30f1..9a962f1 100644 --- a/java/code/src/com/redhat/rhn/common/util/CSVWriter.java +++ b/java/code/src/com/redhat/rhn/common/util/CSVWriter.java @@ -221,7 +221,7 @@ public class CSVWriter extends BufferedWriter implements ExportWriter { */ public void write(String s) throws IOException { // If the string does not contain a comma, just write it out - if (s.indexOf(separatorChar) == -1 && s.indexOf(""") == -1) { + if (s.indexOf(separatorChar) == -1 && s.indexOf('"') == -1) { super.write(s); return; } @@ -232,7 +232,7 @@ public class CSVWriter extends BufferedWriter implements ExportWriter { super.write("""); int from = 0; for (;;) { - int to = s.indexOf(""", from); + int to = s.indexOf('"', from); if (to == -1) { super.write(s, from, s.length() - from); break; diff --git a/java/code/src/com/redhat/rhn/common/util/MD5Crypt.java b/java/code/src/com/redhat/rhn/common/util/MD5Crypt.java index 508b3c0..1026e0a 100644 --- a/java/code/src/com/redhat/rhn/common/util/MD5Crypt.java +++ b/java/code/src/com/redhat/rhn/common/util/MD5Crypt.java @@ -60,7 +60,7 @@ public class MD5Crypt { salt = salt.substring(prefix.length()); }
- int end = salt.indexOf("$"); + int end = salt.indexOf('$'); if (end != -1) { salt = salt.substring(0, end); } diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java index 119c21c..5894f71 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -427,7 +427,7 @@ public class StringUtil { * @return position of last char of URL, returns -1 when entire String is URL */ private static int findEndOfUrl(String entireToken) { - int space = entireToken.indexOf(" "); + int space = entireToken.indexOf(' '); int line = entireToken.indexOf("<br/>"); int tag = entireToken.indexOf("<"); int end = -1; diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java index 562673c..a4b2f9d 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java @@ -130,7 +130,7 @@ public class KickstartBuilder { }
// Split the first word from the rest of the line: - int firstSpaceIndex = currentLine.indexOf(" "); + int firstSpaceIndex = currentLine.indexOf(' '); String firstWord = currentLine; String restOfLine = ""; if (firstSpaceIndex != -1) { diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java index 36859f0..060069d 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java @@ -93,7 +93,7 @@ public class StateChangeData extends BaseDto { if (data == null) { return null; } - String message = data.substring(data.indexOf(" ") + 1); + String message = data.substring(data.indexOf(' ') + 1); return message; }
@@ -105,7 +105,7 @@ public class StateChangeData extends BaseDto { if (htmlifiedData == null) { return null; } - String message = htmlifiedData.substring(htmlifiedData.indexOf(" ") + 1); + String message = htmlifiedData.substring(htmlifiedData.indexOf(' ') + 1); return message; }
diff --git a/java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java b/java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java index d1e976a..e5cab5c 100644 --- a/java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java @@ -112,7 +112,7 @@ public class DialognavRenderer extends Renderable { String allowedFormVars = treeIndex.getTree().getFormvar(); if (allowedFormVars != null) { StringBuffer formVars; - if (href.indexOf("?") == -1) { + if (href.indexOf('?') == -1) { formVars = new StringBuffer("?"); } else { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index aea165b..bbeb061 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -700,7 +700,7 @@ public class ListTagUtil { private static String makePageLink(HttpServletRequest request, String listName, String page) { String url = makeNonPagedLink(request, listName); - if (url.indexOf("?") == -1) { + if (url.indexOf('?') == -1) { url += "?"; } else { diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java index c79ce03..f8b3584 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java @@ -348,7 +348,7 @@ public class KickstartEditCommand extends BaseKickstartCommand { retval = retval.replaceAll( getBaseLabel(this.ksdata.getTree().getChannel()), ""); logger.debug("retval after replace: " + retval); - int hyphen = retval.indexOf("-"); + int hyphen = retval.indexOf('-'); if (hyphen >= 0) { retval = retval.substring(hyphen + 1, retval.length()); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java index 74a9134..49acf53 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java @@ -338,7 +338,7 @@ public class PrimaryXmlWriter extends RepomdWriter { vr = parts[0]; }
- int dash = vr.lastIndexOf("-"); + int dash = vr.lastIndexOf('-');
if (dash == -1) { map.put("version", vr);
spacewalk-commits@lists.fedorahosted.org