Implemented move folder

[pithos] / web_client / src / gr / grnet / pithos / web / client / DeleteFolderDialog.java

diff --git a/web_client/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java b/web_client/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java
index d930bbe..2cdb475 100644 (file)
--- a/web_client/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java
+++ b/web_client/src/gr/grnet/pithos/web/client/DeleteFolderDialog.java
@@ -36,13 +36,26 @@ package gr.grnet.pithos.web.client;
 \r
 import com.google.gwt.core.client.Scheduler;\r
 import com.google.gwt.event.dom.client.KeyDownEvent;\r
+import com.google.gwt.http.client.Request;\r
+import com.google.gwt.http.client.RequestBuilder;\r
+import com.google.gwt.http.client.RequestCallback;\r
+import com.google.gwt.http.client.RequestException;\r
+import com.google.gwt.http.client.Response;\r
+import com.google.gwt.json.client.JSONArray;\r
+import com.google.gwt.json.client.JSONObject;\r
+import com.google.gwt.json.client.JSONParser;\r
+import com.google.gwt.json.client.JSONString;\r
+import com.google.gwt.json.client.JSONValue;\r
 import com.google.gwt.user.client.Event;\r
 import gr.grnet.pithos.web.client.MessagePanel.Images;\r
+import gr.grnet.pithos.web.client.foldertree.File;\r
 import gr.grnet.pithos.web.client.foldertree.Folder;\r
 import gr.grnet.pithos.web.client.foldertree.Resource;\r
 import gr.grnet.pithos.web.client.rest.DeleteCommand;\r
 import gr.grnet.pithos.web.client.rest.DeleteRequest;\r
+import gr.grnet.pithos.web.client.rest.GetRequest;\r
 import gr.grnet.pithos.web.client.rest.RestException;\r
+import gr.grnet.pithos.web.client.rest.RestRequestCallback;\r
 import gr.grnet.pithos.web.client.rest.resource.FolderResource;\r
 import gr.grnet.pithos.web.client.rest.resource.RestResource;\r
 import gr.grnet.pithos.web.client.rest.resource.RestResourceWrapper;\r
@@ -62,6 +75,8 @@ import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;\r
 import com.google.gwt.user.client.ui.HorizontalPanel;\r
 import com.google.gwt.user.client.ui.VerticalPanel;\r
+import java.util.Iterator;\r
+import java.util.List;\r
 \r
 /**\r
  * The 'delete folder' dialog box.\r
@@ -75,9 +90,9 @@ public class DeleteFolderDialog extends DialogBox {
         * The widget's constructor.\r
         * @param images the supplied images\r
         */\r
-       public DeleteFolderDialog(GSS app, Images images, Folder folder) {\r
-        this.app = app;\r
-        this.folder = folder;\r
+       public DeleteFolderDialog(GSS _app, Images images, Folder _folder) {\r
+        this.app = _app;\r
+        this.folder = _folder;\r
                // Set the dialog's caption.\r
                setText("Confirmation");\r
                setAnimationEnabled(true);\r
@@ -96,7 +111,7 @@ public class DeleteFolderDialog extends DialogBox {
                Button ok = new Button("Delete", new ClickHandler() {\r
                        @Override\r
                        public void onClick(ClickEvent event) {\r
-                               deleteFolder();\r
+                               app.deleteFolder(folder);\r
                                hide();\r
                        }\r
                });\r
@@ -121,34 +136,6 @@ public class DeleteFolderDialog extends DialogBox {
                setWidget(outer);\r
        }\r
 \r
-       /**\r
-        * Generate an RPC request to delete a folder.\r
-        *\r
-        */\r
-       private void deleteFolder() {\r
-        String prefix = folder.getPrefix();\r
-        String path = app.getApiPath() + app.getUsername() + "/" + folder.getContainer() + (prefix.length() == 0 ? "" : "/" + prefix);\r
-        DeleteRequest deleteFolder = new DeleteRequest(path) {\r
-            @Override\r
-            public void onSuccess(Resource result) {\r
-\r
-            }\r
-\r
-            @Override\r
-            public void onError(Throwable t) {\r
-                GWT.log("", t);\r
-                if (t instanceof RestException) {\r
-                    int statusCode = ((RestException)t).getHttpStatusCode();\r
-                    app.displayError("Unable to delete folder: "+((RestException) t).getHttpStatusText());\r
-                }\r
-                else\r
-                    GSS.get().displayError("System error unable to delete folder: " + t.getMessage());\r
-            }\r
-        };\r
-        deleteFolder.setHeader("X-Auth-Token", app.getToken());\r
-        Scheduler.get().scheduleDeferred(deleteFolder);\r
-       }\r
-\r
        @Override\r
        protected void onPreviewNativeEvent(NativePreviewEvent preview) {\r
                super.onPreviewNativeEvent(preview);\r
@@ -160,7 +147,7 @@ public class DeleteFolderDialog extends DialogBox {
                        switch (evt.getKeyCode()) {\r
                                case KeyCodes.KEY_ENTER:\r
                                        hide();\r
-                                       deleteFolder();\r
+                                       app.deleteFolder(folder);\r
                                        break;\r
                                case KeyCodes.KEY_ESCAPE:\r
                                        hide();\r