[commons-io] branch master updated: Sort members.

[gg...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new fe37001  Sort members.
     new e64f29c  Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
fe37001 is described below

commit fe370014350633b63453bcc81aa606a3e38fdaf4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 23 17:59:52 2020 -0400

    Sort members.
---
 .../java/org/apache/commons/io/file/PathUtils.java | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java
index d370ef0..5902a74 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -370,24 +370,6 @@ public final class PathUtils {
     }
 
     /**
-     * Returns true if the given options contain {@link StandardDeleteOption#OVERRIDE_READ_ONLY}.
-     *
-     * @param options the array to test
-     * @return true if the given options contain {@link StandardDeleteOption#OVERRIDE_READ_ONLY}.
-     */
-    private static boolean overrideReadOnly(final DeleteOption[] options) {
-        if (options == null) {
-            return false;
-        }
-        for (final DeleteOption deleteOption : options) {
-            if (deleteOption == StandardDeleteOption.OVERRIDE_READ_ONLY) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
      * Compares the file sets of two Paths to determine if they are equal or not while considering file contents. The
      * comparison includes all files in all sub-directories.
      *
@@ -605,6 +587,24 @@ public final class PathUtils {
     }
 
     /**
+     * Returns true if the given options contain {@link StandardDeleteOption#OVERRIDE_READ_ONLY}.
+     *
+     * @param options the array to test
+     * @return true if the given options contain {@link StandardDeleteOption#OVERRIDE_READ_ONLY}.
+     */
+    private static boolean overrideReadOnly(final DeleteOption[] options) {
+        if (options == null) {
+            return false;
+        }
+        for (final DeleteOption deleteOption : options) {
+            if (deleteOption == StandardDeleteOption.OVERRIDE_READ_ONLY) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
      * Relativizes all files in the given {@code collection} against a {@code parent}.
      *
      * @param collection The collection of paths to relativize.