/*\r
- * Copyright 2011 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
*/\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
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
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
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
});\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
// 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
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
}\r
else\r
app.displayError("System error unable to delete file: "+t.getMessage());\r
+ deleteFile(iter);\r
}\r
\r
@Override\r
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