Empty trash deletes everything under trash by using the deleteFolder method

[pithos-web-client] / src / gr / grnet / pithos / web / client / commands / EmptyTrashCommand.java

diff --git a/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java b/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java
index 88d7dbe..f0e5f7a 100644 (file)
--- a/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java
+++ b/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java
@@ -72,27 +72,7 @@ public class EmptyTrashCommand implements Command{
                
                final Folder trash = app.getAccount().getTrash();
                if (trash != null) {
-                       Iterator<File> iter = trash.getFiles().iterator();
-                       deleteFile(iter, new Command() {
-                               
-                               @Override
-                               public void execute() {
-                                       Iterator<Folder> iter2 = trash.getSubfolders().iterator();
-                                       deleteSubfolder(iter2, new Command() {
-                                               
-                                               @Override
-                                               public void execute() {
-                                                       app.updateTrash(true, new Command() {
-                                                               
-                                                               @Override
-                                                               public void execute() {
-                                                                       app.updateStatistics();
-                                                               }
-                                                       });
-                                               }
-                                       });
-                               }
-                       });
+                       app.deleteFolder(trash, null); //deleteFolder will not delete the folder itself if it is a container
                }
        }