Fixed username in all API calls + some other fixes

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

diff --git a/src/gr/grnet/pithos/web/client/DeleteFileDialog.java b/src/gr/grnet/pithos/web/client/DeleteFileDialog.java
index a1ee721..5845397 100644 (file)
--- a/src/gr/grnet/pithos/web/client/DeleteFileDialog.java
+++ b/src/gr/grnet/pithos/web/client/DeleteFileDialog.java
@@ -64,12 +64,16 @@ import com.google.gwt.user.client.ui.VerticalPanel;
 public class DeleteFileDialog extends DialogBox {\r
 \r
     private List<File> files;\r
+\r
+    protected Pithos app;\r
+\r
        /**\r
         * The widget's constructor.\r
         *\r
         * @param images the supplied images\r
         */\r
-       public DeleteFileDialog(Images images, List<File> _files) {\r
+       public DeleteFileDialog(Pithos _app, Images images, List<File> _files) {\r
+        app = _app;\r
         files = _files;\r
                // Set the dialog's caption.\r
                setText("Confirmation");\r
@@ -90,7 +94,7 @@ public class DeleteFileDialog extends DialogBox {
                // when the button is clicked and deletes the file.\r
                Button ok = new Button("Delete", new ClickHandler() {\r
                        @Override\r
-                       public void onClick(ClickEvent event) {\r
+                       public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
                                deleteFiles();\r
                                hide();\r
                        }\r
@@ -102,7 +106,7 @@ public class DeleteFileDialog extends DialogBox {
                // dialog when the button is clicked.\r
                Button cancel = new Button("Cancel", new ClickHandler() {\r
                        @Override\r
-                       public void onClick(ClickEvent event) {\r
+                       public void onClick(@SuppressWarnings("unused") ClickEvent event) {\r
                                hide();\r
                        }\r
                });\r
@@ -121,18 +125,18 @@ public class DeleteFileDialog extends DialogBox {
        /**\r
         * Generate an RPC request to delete a file.\r
         */\r
-       private void deleteFiles() {\r
+       protected void deleteFiles() {\r
         Iterator<File> iter = files.iterator();\r
         deleteFile(iter);\r
     }\r
 \r
-    private void deleteFile(final Iterator<File> iter) {\r
+       protected void deleteFile(final Iterator<File> iter) {\r
         if (iter.hasNext()) {\r
             File f = iter.next();\r
             String path = f.getUri();\r
-            DeleteRequest deleteFile = new DeleteRequest(Pithos.get().getApiPath(), Pithos.get().getUsername(), path) {\r
+            DeleteRequest deleteFile = new DeleteRequest(app.getApiPath(), f.getOwner(), path) {\r
                 @Override\r
-                public void onSuccess(Resource result) {\r
+                public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
                     deleteFile(iter);\r
                 }\r
 \r
@@ -140,17 +144,17 @@ public class DeleteFileDialog extends DialogBox {
                 public void onError(Throwable t) {\r
                     GWT.log("", t);\r
                     if (t instanceof RestException) {\r
-                        Pithos.get().displayError("Unable to delete file: " + ((RestException) t).getHttpStatusText());\r
+                        app.displayError("Unable to delete file: " + ((RestException) t).getHttpStatusText());\r
                     }\r
                     else\r
-                        Pithos.get().displayError("System error unable to delete file: "+t.getMessage());\r
+                        app.displayError("System error unable to delete file: "+t.getMessage());\r
                 }\r
             };\r
-            deleteFile.setHeader("X-Auth-Token", Pithos.get().getToken());\r
+            deleteFile.setHeader("X-Auth-Token", app.getToken());\r
             Scheduler.get().scheduleDeferred(deleteFile);\r
         }\r
         else {\r
-            Pithos.get().updateFolder(files.get(0).getParent());\r
+            app.updateFolder(files.get(0).getParent(), true, null);\r
         }\r
     }\r
 \r