Revert "Provide RightClick/CopyToClipboard functionality for "Public/Private Link...

[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 75396d3..d53a546 100644 (file)
--- a/src/gr/grnet/pithos/web/client/DeleteFileDialog.java
+++ b/src/gr/grnet/pithos/web/client/DeleteFileDialog.java
@@ -1,5 +1,5 @@
 /*\r
- * Copyright 2011-2012 GRNET S.A. All rights reserved.\r
+ * Copyright 2011-2013 GRNET S.A. All rights reserved.\r
  *\r
  * Redistribution and use in source and binary forms, with or\r
  * without modification, are permitted provided that the following\r
@@ -36,7 +36,7 @@ package gr.grnet.pithos.web.client;
 \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.Resource;\r
+import gr.grnet.pithos.web.client.foldertree.Folder;\r
 import gr.grnet.pithos.web.client.rest.DeleteRequest;\r
 import gr.grnet.pithos.web.client.rest.RestException;\r
 \r
@@ -89,7 +89,6 @@ public class DeleteFileDialog extends DialogBox {
                });\r
                // Set the dialog's caption.\r
                setText("Confirmation");\r
-               setAnimationEnabled(true);\r
                setGlassEnabled(true);\r
                setStyleName("pithos-DialogBox");\r
                // Create a VerticalPanel to contain the label and the buttons.\r
@@ -136,7 +135,7 @@ public class DeleteFileDialog extends DialogBox {
         if (iter.hasNext()) {\r
             File f = iter.next();\r
             String path = f.getUri();\r
-            DeleteRequest deleteFile = new DeleteRequest(app.getApiPath(), f.getOwner(), URL.encode(path)) {\r
+            DeleteRequest deleteFile = new DeleteRequest(app.getApiPath(), f.getOwnerID(), URL.encode(path)) {\r
                 @Override\r
                 public void onSuccess(Resource result) {\r
                     deleteFile(iter);\r
@@ -151,6 +150,7 @@ public class DeleteFileDialog extends DialogBox {
                     }\r
                     else\r
                         app.displayError("System error unable to delete file: "+t.getMessage());\r
+                    deleteFile(iter);\r
                 }\r
 \r
                                @Override\r
@@ -158,17 +158,27 @@ public class DeleteFileDialog extends DialogBox {
                                        app.sessionExpired();\r
                                }\r
             };\r
-            deleteFile.setHeader("X-Auth-Token", app.getToken());\r
+            deleteFile.setHeader("X-Auth-Token", app.getUserToken());\r
             Scheduler.get().scheduleDeferred(deleteFile);\r
         }\r
         else {\r
-            app.updateFolder(files.get(0).getParent(), true, new Command() {\r
-                               \r
-                               @Override\r
-                               public void execute() {\r
-                                       app.updateStatistics();\r
-                               }\r
-                       }, true);\r
+               Folder f = files.get(0).getParent();\r
+               if (app.isMySharedSelected())\r
+                       app.updateSharedFolder(f, true, new Command() {\r
+                                       \r
+                                       @Override\r
+                                       public void execute() {\r
+                                               app.updateStatistics();\r
+                                       }\r
+                               });\r
+               else\r
+                   app.updateFolder(files.get(0).getParent(), true, new Command() {\r
+                                       \r
+                                       @Override\r
+                                       public void execute() {\r
+                                               app.updateStatistics();\r
+                                       }\r
+                               }, true);\r
         }\r
     }\r
 \r