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 a3b3eac..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
@@ -90,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
@@ -111,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
@@ -136,118 +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 path = app.getApiPath() + app.getUsername() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + folder.getPrefix();\r
-        RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path);\r
-        builder.setHeader("If-Modified-Since", "0");\r
-        builder.setHeader("X-Auth-Token", app.getToken());\r
-        try {\r
-            builder.sendRequest("", new RequestCallback() {\r
-                @Override\r
-                public void onResponseReceived(Request request, Response response) {\r
-                    if (response.getStatusCode() == Response.SC_OK) {\r
-                        JSONValue json = JSONParser.parseStrict(response.getText());\r
-                        JSONArray array = json.isArray();\r
-                        int i = 0;\r
-                        if (array != null) {\r
-                            deleteObject(i, array);\r
-                        }\r
-                    }\r
-                }\r
-\r
-                @Override\r
-                public void onError(Request request, Throwable exception) {\r
-                    GSS.get().displayError("System error unable to delete folder: " + exception.getMessage());\r
-                }\r
-            });\r
-        }\r
-        catch (RequestException e) {\r
-        }\r
-       }\r
-\r
-    private void deleteObject(final int i, final JSONArray array) {\r
-        if (i < array.size()) {\r
-            JSONObject o = array.get(i).isObject();\r
-            if (o != null && !o.containsKey("subdir")) {\r
-                JSONString name = o.get("name").isString();\r
-                String path = app.getApiPath() + app.getUsername() + "/" + folder.getContainer() + "/" + name.stringValue();\r
-                DeleteRequest delete = new DeleteRequest(path) {\r
-                    @Override\r
-                    public void onSuccess(Resource result) {\r
-                        deleteObject(i + 1, array);\r
-                    }\r
-\r
-                    @Override\r
-                    public void onError(Throwable t) {\r
-                        GWT.log("", t);\r
-                        GSS.get().displayError("System error unable to delete folder: " + t.getMessage());\r
-                    }\r
-                };\r
-                delete.setHeader("X-Auth-Token", app.getToken());\r
-                Scheduler.get().scheduleDeferred(delete);\r
-            }\r
-            else {\r
-                String subdir = o.get("subdir").isString().stringValue();\r
-                subdir = subdir.substring(0, subdir.length() - 1);\r
-                String path = app.getApiPath() + app.getUsername() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + subdir;\r
-                RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path);\r
-                builder.setHeader("If-Modified-Since", "0");\r
-                builder.setHeader("X-Auth-Token", app.getToken());\r
-                try {\r
-                    builder.sendRequest("", new RequestCallback() {\r
-                        @Override\r
-                        public void onResponseReceived(Request request, Response response) {\r
-                            if (response.getStatusCode() == Response.SC_OK) {\r
-                                JSONValue json = JSONParser.parseStrict(response.getText());\r
-                                JSONArray array2 = json.isArray();\r
-                                if (array2 != null) {\r
-                                    int l = array.size();\r
-                                    for (int j=0; j<array2.size(); j++) {\r
-                                        array.set(l++, array2.get(j));\r
-                                    }\r
-                                }\r
-                                deleteObject(i + 1, array);\r
-                            }\r
-                        }\r
-\r
-                        @Override\r
-                        public void onError(Request request, Throwable exception) {\r
-                            GSS.get().displayError("System error unable to delete folder: " + exception.getMessage());\r
-                        }\r
-                    });\r
-                }\r
-                catch (RequestException e) {\r
-                }\r
-            }\r
-        }\r
-        else {\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
-                    app.updateFolder(folder.getParent());\r
-                }\r
-\r
-                @Override\r
-                public void onError(Throwable t) {\r
-                    GWT.log("", t);\r
-                    if (t instanceof RestException) {\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
-\r
        @Override\r
        protected void onPreviewNativeEvent(NativePreviewEvent preview) {\r
                super.onPreviewNativeEvent(preview);\r
@@ -259,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