[commons-io] 01/02: Combine nested 'if' statement in 'else' block to 'else if'.

[ggregory]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git

commit 57aba9817498082fc7b56d146e0733beaf6deb22
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Mon Feb 22 15:01:12 2021 -0500

    Combine nested 'if' statement in 'else' block to 'else if'.
---
 src/main/java/org/apache/commons/io/FilenameUtils.java         |  8 +++-----
 .../java/org/apache/commons/io/output/XmlStreamWriter.java     | 10 ++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java 
b/src/main/java/org/apache/commons/io/FilenameUtils.java
index c14ad08..3a99731 100644
--- a/src/main/java/org/apache/commons/io/FilenameUtils.java
+++ b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -1427,12 +1427,10 @@ public class FilenameUtils {
                         if (repeat >= 0) {
                             backtrack.push(new int[] {wcsIdx, repeat});
                         }
-                    } else {
+                    } else if (!caseSensitivity.checkRegionMatches(fileName, 
textIdx, wcs[wcsIdx])) {
                         // matching from current position
-                        if (!caseSensitivity.checkRegionMatches(fileName, 
textIdx, wcs[wcsIdx])) {
-                            // couldn't match token
-                            break;
-                        }
+                        // couldn't match token
+                        break;
                     }
 
                     // matched text token, move text index to end of matched 
token
diff --git a/src/main/java/org/apache/commons/io/output/XmlStreamWriter.java 
b/src/main/java/org/apache/commons/io/output/XmlStreamWriter.java
index 59849f7..881f1d7 100644
--- a/src/main/java/org/apache/commons/io/output/XmlStreamWriter.java
+++ b/src/main/java/org/apache/commons/io/output/XmlStreamWriter.java
@@ -178,12 +178,10 @@ public class XmlStreamWriter extends Writer {
                         // encoding
                         encoding = defaultEncoding;
                     }
-                } else {
-                    if (xmlProlog.length() >= BUFFER_SIZE) {
-                        // no encoding found in first characters: using default
-                        // encoding
-                        encoding = defaultEncoding;
-                    }
+                } else if (xmlProlog.length() >= BUFFER_SIZE) {
+                    // no encoding found in first characters: using default
+                    // encoding
+                    encoding = defaultEncoding;
                 }
             } else {
                 // no XML prolog: using default encoding