Sort the files/folders of the 'Git Repositories' view

When browsing the working directory of a repository, the contents
of the folders are merely listed in alphabetical order. The view
should first list the folder's subfolders before listing its
files.

Change-Id: I3ef4eddce93a382b12640da8a677326ed80fbed5
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

1 files changed, 27 insertions, 0 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
index 7a22fd0594..08ad07c28b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewContentProvider.java
@@ -13,6 +13,7 @@ package org.eclipse.egit.ui.internal.repository;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -164,6 +165,19 @@ public class RepositoriesViewContentProvider implements ITreeContentProvider {
 				return null;
 
 			File[] childFiles = workingDir.listFiles();
+			Arrays.sort(childFiles, new Comparator<File>() {
+				public int compare(File o1, File o2) {
+					if (o1.isDirectory()) {
+						if (o2.isDirectory()) {
+							return o1.compareTo(o2);
+						}
+						return -1;
+					} else if (o2.isDirectory()) {
+						return 1;
+					}
+					return o1.compareTo(o2);
+				}
+			});
 			for (File file : childFiles) {
 				if (file.isDirectory()) {
 					children.add(new RepositoryTreeNode<File>(node,
@@ -183,6 +197,19 @@ public class RepositoriesViewContentProvider implements ITreeContentProvider {
 			File parent = ((File) node.getObject());
 
 			File[] childFiles = parent.listFiles();
+			Arrays.sort(childFiles, new Comparator<File>() {
+				public int compare(File o1, File o2) {
+					if (o1.isDirectory()) {
+						if (o2.isDirectory()) {
+							return o1.compareTo(o2);
+						}
+						return -1;
+					} else if (o2.isDirectory()) {
+						return 1;
+					}
+					return o1.compareTo(o2);
+				}
+			});
 			for (File file : childFiles) {
 				if (file.isDirectory()) {
 					children.add(new RepositoryTreeNode<File>(node,