Show display name in FilePropertiesDialog

[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 aee2d28..ffbacdd 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 GRNET S.A. All rights reserved.\r
+ * Copyright 2011-2012 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
@@ -34,10 +34,9 @@
  */\r
 package gr.grnet.pithos.web.client;\r
 \r
-import com.google.gwt.core.client.Scheduler;\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
@@ -45,11 +44,13 @@ import java.util.Iterator;
 import java.util.List;\r
 \r
 import com.google.gwt.core.client.GWT;\r
+import com.google.gwt.core.client.Scheduler;\r
 import com.google.gwt.dom.client.NativeEvent;\r
 import com.google.gwt.event.dom.client.ClickEvent;\r
 import com.google.gwt.event.dom.client.ClickHandler;\r
 import com.google.gwt.event.dom.client.KeyCodes;\r
 import com.google.gwt.http.client.Response;\r
+import com.google.gwt.http.client.URL;\r
 import com.google.gwt.user.client.Command;\r
 import com.google.gwt.user.client.Event.NativePreviewEvent;\r
 import com.google.gwt.user.client.ui.AbstractImagePrototype;\r
@@ -58,7 +59,6 @@ import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.DialogBox;\r
 import com.google.gwt.user.client.ui.HTML;\r
 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
 \r
 /**\r
@@ -78,7 +78,7 @@ public class DeleteFileDialog extends DialogBox {
        public DeleteFileDialog(Pithos _app, Images images, List<File> _files) {\r
         app = _app;\r
         files = _files;\r
-               Anchor close = new Anchor();\r
+               Anchor close = new Anchor("close");\r
                close.addStyleName("close");\r
                close.addClickHandler(new ClickHandler() {\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
@@ -111,7 +110,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(@SuppressWarnings("unused") ClickEvent event) {\r
+                       public void onClick(ClickEvent event) {\r
                                deleteFiles();\r
                                hide();\r
                        }\r
@@ -136,9 +135,9 @@ 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(), path) {\r
+            DeleteRequest deleteFile = new DeleteRequest(app.getApiPath(), f.getOwnerID(), URL.encode(path)) {\r
                 @Override\r
-                public void onSuccess(@SuppressWarnings("unused") Resource result) {\r
+                public void onSuccess(Resource result) {\r
                     deleteFile(iter);\r
                 }\r
 \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
-                       });\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