From 70d9e8b23d924a15c1d79ec1d0ce42ee916a7cee Mon Sep 17 00:00:00 2001 From: "Gary D. Gregory" Date: Thu, 10 Apr 2014 13:12:51 +0000 Subject: [PATCH] Statement unnecessarily nested within else clause. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1586291 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/lang3/CharSequenceUtils.java | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java index 3e3b00ab4..dc3992d81 100644 --- a/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java +++ b/src/main/java/org/apache/commons/lang3/CharSequenceUtils.java @@ -186,31 +186,30 @@ static boolean regionMatches(final CharSequence cs, final boolean ignoreCase, fi final CharSequence substring, final int start, final int length) { if (cs instanceof String && substring instanceof String) { return ((String) cs).regionMatches(ignoreCase, thisStart, (String) substring, start, length); - } else { - int index1 = thisStart; - int index2 = start; - int tmpLen = length; + } + int index1 = thisStart; + int index2 = start; + int tmpLen = length; - while (tmpLen-- > 0) { - char c1 = cs.charAt(index1++); - char c2 = substring.charAt(index2++); + while (tmpLen-- > 0) { + char c1 = cs.charAt(index1++); + char c2 = substring.charAt(index2++); - if (c1 == c2) { - continue; - } - - if (!ignoreCase) { - return false; - } - - // The same check as in String.regionMatches(): - if (Character.toUpperCase(c1) != Character.toUpperCase(c2) - && Character.toLowerCase(c1) != Character.toLowerCase(c2)) { - return false; - } + if (c1 == c2) { + continue; } - return true; + if (!ignoreCase) { + return false; + } + + // The same check as in String.regionMatches(): + if (Character.toUpperCase(c1) != Character.toUpperCase(c2) + && Character.toLowerCase(c1) != Character.toLowerCase(c2)) { + return false; + } } + + return true; } }