Merge pull request #1793 from vladak/xref_list_ordering

prefer directories in directory listing ordering

Author: tarzanek

src/org/opensolaris/opengrok/configuration/Configuration.java

@@ -243,6 +243,11 @@ public final class Configuration {
      */
     private boolean displayRepositories;
 
+    /**
+     * If true, list directories first in xref directory listing.
+     */
+    private boolean listDirsFirst = true;
+
     /*
      * types of handling history for remote SCM repositories:
      *  ON - index history and display it in webapp
@@ -928,6 +933,14 @@ public void setDisplayRepositories(boolean flag) {
         this.displayRepositories = flag;
     }
 
+    public boolean getListDirsFirst() {
+        return listDirsFirst;
+    }
+
+    public void setListDirsFirst(boolean flag) {
+        listDirsFirst = flag;
+    }
+
     /**
      * Get the contents of a file or empty string if the file cannot be read.
      */

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -1190,6 +1190,14 @@ public void setDisplayRepositories(boolean flag) {
         threadConfig.get().setDisplayRepositories(flag);
     }
 
+    public boolean getListDirsFirst() {
+        return threadConfig.get().getListDirsFirst();
+    }
+
+    public void setListDirsFirst(boolean flag) {
+        threadConfig.get().setListDirsFirst(flag);
+    }
+    
     /**
      * Read an configuration file and set it as the current configuration.
      *

src/org/opensolaris/opengrok/web/PageConfig.java

@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
@@ -391,15 +392,37 @@ public String canProcess() {
      */
     public List<String> getResourceFileList() {
         if (dirFileList == null) {
-            String[] files = null;
+            File[] files = null;
             if (isDir() && getResourcePath().length() > 1) {
-                files = getResourceFile().list();
+                files = getResourceFile().listFiles();
             }
             if (files == null) {
                 dirFileList = Collections.emptyList();
             } else {
-                Arrays.sort(files, String.CASE_INSENSITIVE_ORDER);
-                List<String> listOfFiles = Arrays.asList(files);
+                List<String> listOfFiles;
+                if (env.getListDirsFirst()) {
+                    Arrays.sort(files, new Comparator<File>() {
+                            @Override
+                            public int compare(File f1, File f2) {
+                                if (f1.isDirectory() && f2.isDirectory()) {
+                                    return f1.getName().compareTo(f2.getName());
+                                } else if (f1.isFile() && f2.isFile()) {
+                                    return f1.getName().compareTo(f2.getName());
+                                } else {
+                                    if (f1.isFile() && f2.isDirectory())
+                                        return 1;
+                                    else
+                                        return -1;
+                                }
+                            }
+                        });
+                } else {
+                    Arrays.sort(files,
+                            (File f1, File f2) -> f1.getName().compareTo(f2.getName()));
+                }
+                listOfFiles = Arrays.asList(files).stream().
+                            map(f -> f.getName()).collect(Collectors.toList());
+
                 if (env.hasProjects() && getPath().isEmpty()) {
                     /**
                      * This denotes the source root directory, we need to filter
@@ -421,6 +444,7 @@ public List<String> getResourceFileList() {
                     });
                     return dirFileList = Collections.unmodifiableList(modifiableListOfFiles);
                 }
+
                 dirFileList = Collections.unmodifiableList(listOfFiles);
             }
         }