Imported changesets 6ad7cf34a8f5, d535941636f3, f3a4422f7b1a from the default branch

[pithos] / src / gr / ebs / gss / server / webdav / milton / GssRootFolderResource.java

diff --git a/src/gr/ebs/gss/server/webdav/milton/GssRootFolderResource.java b/src/gr/ebs/gss/server/webdav/milton/GssRootFolderResource.java
index 2783997..68643fd 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/milton/GssRootFolderResource.java
+++ b/src/gr/ebs/gss/server/webdav/milton/GssRootFolderResource.java
@@ -23,9 +23,7 @@ import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.FileHeader;
 import gr.ebs.gss.server.domain.Folder;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.FolderDTO;
-import gr.ebs.gss.server.domain.dto.UserDTO;
+import gr.ebs.gss.server.domain.User;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -65,7 +63,6 @@ public class GssRootFolderResource extends GssFolderResource{
                        //log.info("ROOT FOLDER:"+folder);
                } catch (RpcException e) {
                        // TODO Auto-generated catch block
-                       e.printStackTrace();
                }
        }
        
@@ -74,7 +71,7 @@ public class GssRootFolderResource extends GssFolderResource{
                // TODO Auto-generated method stub
                boolean result = factory.getSecurityManager().authorise(request, method, auth, this);
         if(result){
-               UserDTO user = getCurrentUser();
+               User user = getCurrentUser();
                if(user==null)
                        //log.info("AUTH USER NULL");
                if(this.folder==null){
@@ -116,8 +113,7 @@ public class GssRootFolderResource extends GssFolderResource{
                        try {
                                this.folder = (Folder) factory.getResourceGss(path,getCurrentUser());
                        } catch (RpcException e) {
-                               // TODO Auto-generated catch block
-                               e.printStackTrace();
+                               // 
                        }
                return super.child(name);
        }
@@ -128,25 +124,24 @@ public class GssRootFolderResource extends GssFolderResource{
                        try {
                                this.folder = (Folder) factory.getResourceGss(path,getCurrentUser());
                        } catch (RpcException e) {
-                               // TODO Auto-generated catch block
-                               e.printStackTrace();
+                               // 
                        }
                List<Resource> result = new ArrayList<Resource>();
                for(Folder f : folder.getSubfolders())
                        if(!f.isDeleted())
                                result.add(new GssFolderResource(host, factory, f,getCurrentUser()));
                try {
-                       for(FileHeader f : factory.getService().getFiles(getCurrentUser().getId(), folder.getId(), true))
+                       for(FileHeader f : getService().getFiles(getCurrentUser().getId(), folder.getId(), true))
                                result.add(new GssFileResource(host, factory, f,getCurrentUser()));
                } catch (ObjectNotFoundException e) {
-                       // TODO Auto-generated catch block
-                       e.printStackTrace();
+                       // 
+                       
                } catch (InsufficientPermissionsException e) {
-                       // TODO Auto-generated catch block
-                       e.printStackTrace();
+                       // 
+                       
                } catch (RpcException e) {
-                       // TODO Auto-generated catch block
-                       e.printStackTrace();
+                       // 
+                       
                }
                //result.add(new GssOthersResource(host, factory));
                return result;