Replaced move procedures with the new PUT with delimiter

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

diff --git a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
index d784cc9..245b059 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
+++ b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
@@ -299,57 +299,19 @@ public class FolderPropertiesDialog extends DialogBox {
                return;\r
         if (!folder.isContainer() && !folder.getName().equals(newName)) {\r
             final String path = folder.getParent().getUri() + "/" + newName;\r
-            PutRequest newFolder = new PutRequest(app.getApiPath(), folder.getParent().getOwner(), path) {\r
-                @Override\r
-                public void onSuccess(Resource result) {\r
-                    Iterator<File> iter = folder.getFiles().iterator();\r
-                    app.copyFiles(iter, folder.getParent().getOwner(), folder.getParent().getUri() + "/" + newName, new Command() {\r
-                        @Override\r
-                        public void execute() {\r
-                            Iterator<Folder> iterf = folder.getSubfolders().iterator();\r
-                            app.copySubfolders(iterf, folder.getParent().getOwner(), folder.getParent().getUri() + "/" + newName, new Command() {\r
-                                @Override\r
-                                public void execute() {\r
-                                    app.deleteFolder(folder, new Command() {\r
-                                                                               \r
-                                                                               @Override\r
-                                                                               public void execute() {\r
-                                                   app.updateFolder(folder.getParent(), false, new Command() {\r
-                                                               \r
-                                                               @Override\r
-                                                               public void execute() {\r
-                                                                       app.updateMySharedRoot();\r
-                                                               }\r
-                                                       }, true);\r
-                                                                               }\r
-                                                                       });\r
-                                }\r
-                            });\r
-                        }\r
-                    });\r
-                }\r
-\r
-                @Override\r
-                public void onError(Throwable t) {\r
-                    GWT.log("", t);\r
-                                       app.setError(t);\r
-                    if(t instanceof RestException){\r
-                        app.displayError("Unable to update folder: " + ((RestException) t).getHttpStatusText());\r
-                    }\r
-                    else\r
-                        app.displayError("System error modifying folder: " + t.getMessage());\r
-                }\r
-\r
+            app.copyFolder(folder, folder.getOwner(), path, true, new Command() {\r
+                               \r
                                @Override\r
-                               protected void onUnauthorized(Response response) {\r
-                                       app.sessionExpired();\r
+                               public void execute() {\r
+                    app.updateFolder(folder.getParent(), false, new Command() {\r
+                               \r
+                               @Override\r
+                               public void execute() {\r
+                                       app.updateMySharedRoot();\r
+                               }\r
+                       }, true);\r
                                }\r
-            };\r
-            newFolder.setHeader("X-Auth-Token", app.getToken());\r
-            newFolder.setHeader("Content-Type", "application/folder");\r
-            newFolder.setHeader("Accept", "*/*");\r
-            newFolder.setHeader("Content-Length", "0");\r
-            Scheduler.get().scheduleDeferred(newFolder);\r
+                       });\r
         }\r
         else\r
             app.updateFolder(folder.getParent(), false, new Command() {\r