From 5f91f72debed85ff6ce474bac9d306026886eac0 Mon Sep 17 00:00:00 2001 From: Christos Stathis Date: Wed, 1 Feb 2012 18:23:17 +0200 Subject: [PATCH] Encoded path for DELETE requests --- src/gr/grnet/pithos/web/client/DeleteFileDialog.java | 3 ++- src/gr/grnet/pithos/web/client/Pithos.java | 4 ++-- src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java | 4 ++-- src/gr/grnet/pithos/web/client/commands/RestoreTrashCommand.java | 2 +- src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gr/grnet/pithos/web/client/DeleteFileDialog.java b/src/gr/grnet/pithos/web/client/DeleteFileDialog.java index d00dca0..3d39eb4 100644 --- a/src/gr/grnet/pithos/web/client/DeleteFileDialog.java +++ b/src/gr/grnet/pithos/web/client/DeleteFileDialog.java @@ -50,6 +50,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.http.client.Response; +import com.google.gwt.http.client.URL; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Event.NativePreviewEvent; import com.google.gwt.user.client.ui.AbstractImagePrototype; @@ -135,7 +136,7 @@ public class DeleteFileDialog extends DialogBox { if (iter.hasNext()) { File f = iter.next(); String path = f.getUri(); - DeleteRequest deleteFile = new DeleteRequest(app.getApiPath(), f.getOwner(), path) { + DeleteRequest deleteFile = new DeleteRequest(app.getApiPath(), f.getOwner(), URL.encode(path)) { @Override public void onSuccess(Resource result) { deleteFile(iter); diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java index f316e4b..8951dc8 100644 --- a/src/gr/grnet/pithos/web/client/Pithos.java +++ b/src/gr/grnet/pithos/web/client/Pithos.java @@ -866,7 +866,7 @@ public class Pithos implements EntryPoint, ResizeHandler { if (o != null && !o.containsKey("subdir")) { JSONString name = o.get("name").isString(); String path = "/" + folder.getContainer() + "/" + name.stringValue(); - DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), path) { + DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), URL.encode(path)) { @Override public void onSuccess(Resource result) { deleteObject(folder, i + 1, array); @@ -923,7 +923,7 @@ public class Pithos implements EntryPoint, ResizeHandler { } else { String path = folder.getUri(); - DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), path) { + DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), URL.encode(path)) { @Override public void onSuccess(Resource result) { updateFolder(folder.getParent(), true, new Command() { diff --git a/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java b/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java index f5f7db7..ebbc408 100644 --- a/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/EmptyTrashCommand.java @@ -114,7 +114,7 @@ public class EmptyTrashCommand implements Command{ @Override public void execute() { String path = _f.getUri(); - DeleteRequest deleteF = new DeleteRequest(app.getApiPath(), _f.getOwner(), path) { + DeleteRequest deleteF = new DeleteRequest(app.getApiPath(), _f.getOwner(), URL.encode(path)) { @Override public void onSuccess(Resource _result) { @@ -174,7 +174,7 @@ public class EmptyTrashCommand implements Command{ if (iter.hasNext()) { File f = iter.next(); String path = f.getUri(); - DeleteRequest deleteF = new DeleteRequest(app.getApiPath(), f.getOwner(), path) { + DeleteRequest deleteF = new DeleteRequest(app.getApiPath(), f.getOwner(), URL.encode(path)) { @Override public void onSuccess(Resource result) { diff --git a/src/gr/grnet/pithos/web/client/commands/RestoreTrashCommand.java b/src/gr/grnet/pithos/web/client/commands/RestoreTrashCommand.java index b058359..2b5a91f 100644 --- a/src/gr/grnet/pithos/web/client/commands/RestoreTrashCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/RestoreTrashCommand.java @@ -127,7 +127,7 @@ public class RestoreTrashCommand implements Command { @Override public void execute() { - DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), _f.getOwner(), _f.getUri()) { + DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), _f.getOwner(), URL.encode(_f.getUri())) { @Override public void onSuccess(Resource _result) { diff --git a/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java b/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java index 61e4f48..d1f3556 100644 --- a/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java +++ b/src/gr/grnet/pithos/web/client/commands/ToTrashCommand.java @@ -127,7 +127,7 @@ public class ToTrashCommand implements Command{ @Override public void execute() { - DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), _f.getOwner(), _f.getUri()) { + DeleteRequest deleteFolder = new DeleteRequest(app.getApiPath(), _f.getOwner(), URL.encode(_f.getUri())) { @Override public void onSuccess(Resource _result) { -- 1.7.10.4