Merge branch 'master' of https://github.com/sgloutnikov/CS249-P1

filesystem/test1

@@ -0,0 +1 @@
+test1 file text

src/main/java/edu/sjsu/cs249/project1/client/ClientApplication.java

@@ -48,13 +48,11 @@ public static void main(final String[] args) throws RemoteException, NotBoundExc
                     break;
                 }
 
-                // this will list all the files on the server
-
                 case "ls": {
+
                     System.out.println("List files on the server");
                     Set<String> temp = serverService.listFiles(client1);
                     client1.listFiles(temp);
-
                     break;
                 }
 

src/main/java/edu/sjsu/cs249/project1/server/File.java

@@ -2,6 +2,7 @@
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.Serializable;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -13,7 +14,7 @@
  *
  * @author David Fisher
  */
-public class File {
+public class File implements Serializable {
     /**
      * Note: FILE_PATH_PREFIX is relative to your workspace installation directory.
      */

src/main/java/edu/sjsu/cs249/project1/server/FileServer.java

@@ -76,14 +76,10 @@ public String version() {
      *
      */
     public Set<String> listFiles(ClientCallback client) throws RemoteException{
-        Set result=null;
-        FileSystem fileSystem=FileSystem.getInstance();
-        try {
-            result = fileSystem.listFiles();
-        } catch (FileException e) {
-            e.printStackTrace();
-        }
-     return result;
+        Set result = null;
+        FileSystem fileSystem = FileSystem.getInstance();
+        result = fileSystem.listFiles();
+        return result;
     }
 
     /**

src/main/java/edu/sjsu/cs249/project1/server/FileSystem.java

@@ -184,19 +184,8 @@ public void modifyFile(final String fileName, final byte[] newData) throws FileE
      *
      *
      */
-    public Set<String> listFiles() throws FileException {
-        Set result= null;
-        if (this.fileMap== null) {
-            System.out.println("Server hosts no files and can't list any. ");
-        }
-
-        //for (String filename: FileSystem.getInstance().getFileMap().keySet()) {
-        //System.out.println(filename +"\n");
-        else{
-            result = FileSystem.getInstance().getFileMap().keySet();
-        }
-
-        return result;
+    public Set<String> listFiles() {
+        return fileMap.keySet();
     }
 
     public Map<String, File> getFileMap() {