Order files lists.

Paul-DS · Paul-DS · commit 42b86e8b9823 · 2016-02-28T14:04:38.000+01:00
diff --git a/app/src/main/java/com/paulds/simpleftp/data/entities/FileEntity.java b/app/src/main/java/com/paulds/simpleftp/data/entities/FileEntity.java
@@ -5,7 +5,7 @@
  *
  * @author Paul-DS
  */
-public class FileEntity {
+public class FileEntity implements Comparable<FileEntity> {
 
     /**
      * The file name.
@@ -90,4 +90,20 @@ public boolean isDirectory() {
     public void setIsDirectory(boolean isDirectory) {
         this.isDirectory = isDirectory;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int compareTo(FileEntity file) {
+        if(this.isDirectory() && !file.isDirectory()) {
+            return -1;
+        }
+        else if(!this.isDirectory() && file.isDirectory()) {
+            return 1;
+        }
+        else {
+            return this.getName().compareToIgnoreCase(file.getName());
+        }
+    }
 }
diff --git a/app/src/main/java/com/paulds/simpleftp/data/repository/FileRepository.java b/app/src/main/java/com/paulds/simpleftp/data/repository/FileRepository.java
@@ -6,6 +6,8 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -35,6 +37,8 @@ public List<FileEntity> listFiles(String path) {
             }
         }
 
+        Collections.sort(results);
+
         return results;
     }
 
diff --git a/app/src/main/java/com/paulds/simpleftp/data/repository/FtpRepository.java b/app/src/main/java/com/paulds/simpleftp/data/repository/FtpRepository.java
@@ -8,6 +8,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -56,6 +57,8 @@ public List<FileEntity> listFiles(FtpServer server, String path) throws FTPExcep
             }
         }
 
+        Collections.sort(results);
+
         return results;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`import java.io.File;`
`8`	`8`	`import java.util.ArrayList;`
	`9`	`+import java.util.Collection;`
	`10`	`+import java.util.Collections;`
`9`	`11`	`import java.util.List;`
`10`	`12`
`11`	`13`	`/**`
`@@ -35,6 +37,8 @@ public List<FileEntity> listFiles(String path) {`
`35`	`37`	`}`
`36`	`38`	`}`
`37`	`39`
	`40`	`+ Collections.sort(results);`
	`41`	`+`
`38`	`42`	`return results;`
`39`	`43`	`}`
`40`	`44`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import java.io.File;`
`9`	`9`	`import java.io.IOException;`
`10`	`10`	`import java.util.ArrayList;`
	`11`	`+import java.util.Collections;`
`11`	`12`	`import java.util.Dictionary;`
`12`	`13`	`import java.util.Enumeration;`
`13`	`14`	`import java.util.Hashtable;`
`@@ -56,6 +57,8 @@ public List<FileEntity> listFiles(FtpServer server, String path) throws FTPExcep`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`
	`60`	`+ Collections.sort(results);`
	`61`	`+`
`59`	`62`	`return results;`
`60`	`63`	`}`
`61`	`64`