Merge from gss trunk r278.

diff --git a/gss/src/gr/ebs/gss/client/rest/resource/OtherUserResource.java b/gss/src/gr/ebs/gss/client/rest/resource/OtherUserResource.java
index 6b099fb..e66bafa 100644 (file)
--- a/gss/src/gr/ebs/gss/client/rest/resource/OtherUserResource.java
+++ b/gss/src/gr/ebs/gss/client/rest/resource/OtherUserResource.java
@@ -39,6 +39,7 @@ public class OtherUserResource extends RestResource{
        }
 
        String username;
+       String name;
        List<String> filePaths = new LinkedList<String>();
        List<String> subfolderPaths = new LinkedList<String>();
        List<FolderResource> folders = new ArrayList<FolderResource>();
@@ -63,6 +64,24 @@ public class OtherUserResource extends RestResource{
        }
 
        /**
+        * Retrieve the name.
+        *
+        * @return the name
+        */
+       public String getName() {
+               return name;
+       }
+
+       /**
+        * Modify the name.
+        *
+        * @param aName the name to set
+        */
+       public void setName(String aName) {
+               name = aName;
+       }
+
+       /**
         * Retrieve the files.
         *
         * @return the files
@@ -180,6 +199,15 @@ public class OtherUserResource extends RestResource{
                                                filePaths.add(furi);
                                                String fpath = unmarshallString(fo, "path");
                                                fpath = URL.decodeComponent(fpath);
+                                               String folderName = null;
+                                               String folderURI = null;
+                                               if (fo.get("folder") != null) {
+                                                       JSONObject folder = fo.get("folder").isObject();
+                                                       folderURI = unmarshallString(folder, "uri");
+                                                       folderName = unmarshallString(folder, "name");
+                                                       if(folderName != null)
+                                                               folderName = URL.decodeComponent(folderName);
+                                               }
                                                FileResource fs = new FileResource(furi);
                                                fs.setName(fname);
                                                fs.setPath(fpath);
@@ -189,14 +217,12 @@ public class OtherUserResource extends RestResource{
                                                fs.setDeleted(fdeleted);
                                                fs.setCreationDate(fcreationDate);
                                                fs.setContentType(fcontent);
+                                               fs.setFolderName(folderName);
+                                               fs.setFolderURI(folderURI);
                                                files.add(fs);
                                        }
                                }
                }
        }
 
-       public String getName(){
-               String[] names = uri.split("/");
-               return names[names.length -1];
-       }
 }

diff --git a/gss/src/gr/ebs/gss/server/rest/OthersHandler.java b/gss/src/gr/ebs/gss/server/rest/OthersHandler.java
index cadb6d8..5b02e69 100644 (file)
--- a/gss/src/gr/ebs/gss/server/rest/OthersHandler.java
+++ b/gss/src/gr/ebs/gss/server/rest/OthersHandler.java
@@ -26,6 +26,7 @@ import gr.ebs.gss.server.domain.dto.FolderDTO;
 import gr.ebs.gss.server.domain.dto.UserDTO;
 
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -136,6 +137,10 @@ public class OthersHandler extends RequestHandler {
                                        put("creationDate", f.getAuditInfo().getCreationDate().getTime()).
                                        put("path", f.getFolder().getPath()).
                                        put("uri", parentUrl + f.getPath());
+                               JSONObject p = new JSONObject();
+                               p.put("uri", f.getFolder().getURI()).
+                                               put("name", URLEncoder.encode(f.getFolder().getName(),"UTF-8"));
+                               j.put("folder", p);
                                files.add(j);
                }
                json.put("files", files);