Fixed bug in move-to-trash where very deep trees were not trashed

diff --git a/web_client/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java b/web_client/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java
index 9e8dea4..b4677dc 100644 (file)
--- a/web_client/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java
+++ b/web_client/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java
@@ -39,6 +39,7 @@ import gr.grnet.pithos.web.client.foldertree.File;
 import gr.grnet.pithos.web.client.foldertree.Folder;
 import gr.grnet.pithos.web.client.foldertree.Resource;
 import gr.grnet.pithos.web.client.rest.DeleteRequest;
+import gr.grnet.pithos.web.client.rest.GetRequest;
 import gr.grnet.pithos.web.client.rest.PutRequest;
 import gr.grnet.pithos.web.client.rest.RestException;
 
@@ -48,6 +49,7 @@ import java.util.List;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.http.client.Response;
+import com.google.gwt.http.client.URL;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.PopupPanel;
 
@@ -100,44 +102,67 @@ public class ToTrashCommand implements Command{
         PutRequest createFolder = new PutRequest(app.getApiPath(), app.getUsername(), path) {
             @Override
             public void onSuccess(@SuppressWarnings("unused") Resource result) {
-                Iterator<File> iter = f.getFiles().iterator();
-                trashFiles(iter, new Command() {
-                    @Override
-                    public void execute() {
-                        Iterator<Folder> iterf = f.getSubfolders().iterator();
-                        trashSubfolders(iterf, new Command() {
-                                                       
-                                                       @Override
-                                                       public void execute() {
-                                                               DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), f.getOwner(), f.getUri()) {
-                                                                       
-                                                                       @Override
-                                                                       public void onSuccess(@SuppressWarnings("unused") Resource _result) {
-                                                                               if (callback != null)
-                                                                                       callback.execute();
-                                                                       }
+               GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, app.getApiPath(), f.getOwner(), "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(f.getPrefix()), f) {
+
+                                       @Override
+                                       public void onSuccess(final Folder _f) {
+                                           Iterator<File> iter = _f.getFiles().iterator();
+                                           trashFiles(iter, new Command() {
+                                               @Override
+                                               public void execute() {
+                                                   Iterator<Folder> iterf = _f.getSubfolders().iterator();
+                                                   trashSubfolders(iterf, new Command() {
                                                                        
                                                                        @Override
-                                                                       public void onError(Throwable t) {
-                                                           GWT.log("", t);
-                                                           if (t instanceof RestException) {
-                                                               app.displayError("Unable to delete folder: " + ((RestException) t).getHttpStatusText());
-                                                           }
-                                                           else
-                                                               app.displayError("System error unable to delete folder: "+t.getMessage());
-                                                                       }
+                                                                       public void execute() {
+                                                                               DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), _f.getOwner(), _f.getUri()) {
+                                                                                       
+                                                                                       @Override
+                                                                                       public void onSuccess(@SuppressWarnings("unused") Resource _result) {
+                                                                                               if (callback != null)
+                                                                                                       callback.execute();
+                                                                                       }
+                                                                                       
+                                                                                       @Override
+                                                                                       public void onError(Throwable t) {
+                                                                           GWT.log("", t);
+                                                                           if (t instanceof RestException) {
+                                                                               app.displayError("Unable to delete folder: " + ((RestException) t).getHttpStatusText());
+                                                                           }
+                                                                           else
+                                                                               app.displayError("System error unable to delete folder: "+t.getMessage());
+                                                                                       }
 
-                                                                       @Override
-                                                                       protected void onUnauthorized(Response response) {
-                                                                               app.sessionExpired();
+                                                                                       @Override
+                                                                                       protected void onUnauthorized(Response response) {
+                                                                                               app.sessionExpired();
+                                                                                       }
+                                                                               };
+                                                                               deleteFolder.setHeader("X-Auth-Token", app.getToken());
+                                                                               Scheduler.get().scheduleDeferred(deleteFolder);
                                                                        }
-                                                               };
-                                                               deleteFolder.setHeader("X-Auth-Token", app.getToken());
-                                                               Scheduler.get().scheduleDeferred(deleteFolder);
-                                                       }
-                                               });
-                    }
-                });
+                                                               });
+                                               }
+                                           });
+                                       }
+
+                                       @Override
+                                       public void onError(Throwable t) {
+                               GWT.log("", t);
+                               if (t instanceof RestException) {
+                                   app.displayError("Unable to get folder: " + ((RestException) t).getHttpStatusText());
+                               }
+                               else
+                                   app.displayError("System error getting folder: " + t.getMessage());
+                                       }
+
+                                       @Override
+                                       protected void onUnauthorized(Response response) {
+                                               app.sessionExpired();
+                                       }
+                               };
+                               getFolder.setHeader("X-Auth-Token", app.getToken());
+                               Scheduler.get().scheduleDeferred(getFolder);
             }
 
             @Override
@@ -162,6 +187,8 @@ public class ToTrashCommand implements Command{
         Scheduler.get().scheduleDeferred(createFolder);
     }
 
+
+    
     protected void trashFiles(final Iterator<File> iter, final Command callback) {
         if (iter.hasNext()) {
             File file = iter.next();
@@ -199,7 +226,13 @@ public class ToTrashCommand implements Command{
     protected void trashSubfolders(final Iterator<Folder> iter, final Command callback) {
         if (iter.hasNext()) {
             final Folder f = iter.next();
-            trashFolder(f, callback);
+            trashFolder(f, new Command() {
+                               
+                               @Override
+                               public void execute() {
+                                       trashSubfolders(iter, callback);
+                               }
+                       });
         }
         else  {
                app.updateTrash(false, callback);