JAL-629 sort files from java glob for predictability. reduce maxdepth of walkfiletree

[jalview.git] / src / jalview / util / FileUtils.java

diff --git a/src/jalview/util/FileUtils.java b/src/jalview/util/FileUtils.java
index b6f4e90..f5b3701 100644 (file)
--- a/src/jalview/util/FileUtils.java
+++ b/src/jalview/util/FileUtils.java
@@ -12,6 +12,7 @@ import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -67,10 +68,11 @@ public class FileUtils
           String glob = "glob:" + parentDir.toString() + File.separator
                   + rest;
           PathMatcher pm = FileSystems.getDefault().getPathMatcher(glob);
-          int maxDepth = rest.contains("**") ? Integer.MAX_VALUE
+          int maxDepth = rest.contains("**") ? 1028
                   : (int) (rest.chars()
                           .filter(ch -> ch == File.separatorChar).count())
                           + 1;
+
           Files.walkFileTree(parentDir,
                   EnumSet.of(FileVisitOption.FOLLOW_LINKS), maxDepth,
                   new SimpleFileVisitor<Path>()
@@ -108,6 +110,7 @@ public class FileUtils
         files.add(f);
       }
     }
+    Collections.sort(files);
 
     return files;
   }