Formating commit. Comments fixed after code review. 1. Added a 2010 entry in copyrigh...

[pithos] / src / gr / ebs / gss / client / dnd / DnDFolderPopupMenu.java

diff --git a/src/gr/ebs/gss/client/dnd/DnDFolderPopupMenu.java b/src/gr/ebs/gss/client/dnd/DnDFolderPopupMenu.java
index 6db1635..3a73cac 100644 (file)
--- a/src/gr/ebs/gss/client/dnd/DnDFolderPopupMenu.java
+++ b/src/gr/ebs/gss/client/dnd/DnDFolderPopupMenu.java
@@ -31,8 +31,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.http.client.URL;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
 import com.google.gwt.user.client.ui.MenuBar;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.TreeItem;
@@ -65,7 +67,7 @@ public class DnDFolderPopupMenu extends PopupPanel {
                final MenuBar contextMenu = new MenuBar(true);
                final Folders folders = GSS.get().getFolders();
 
-               contextMenu.addItem("<span>" + newImages.cut().getHTML() + "&nbsp;Move</span>", true, new Command() {
+               contextMenu.addItem("<span>" + AbstractImagePrototype.create(newImages.cut()).getHTML() + "&nbsp;Move</span>", true, new Command() {
 
                                public void execute() {
                                        if (toCopy instanceof FolderResource){
@@ -83,7 +85,7 @@ public class DnDFolderPopupMenu extends PopupPanel {
 
                        }).setVisible(target != null);
 
-               contextMenu.addItem("<span>" + newImages.copy().getHTML() + "&nbsp;Copy</span>", true, new Command() {
+               contextMenu.addItem("<span>" + AbstractImagePrototype.create(newImages.copy()).getHTML() + "&nbsp;Copy</span>", true, new Command() {
 
                        public void execute() {
                                if (toCopy instanceof FolderResource)
@@ -95,7 +97,7 @@ public class DnDFolderPopupMenu extends PopupPanel {
 
                }).setVisible(target != null);
 
-               contextMenu.addItem("<span>" + newImages.trash().getHTML() + "&nbsp;Delete (Trash)</span>", true, new Command() {
+               contextMenu.addItem("<span>" + AbstractImagePrototype.create(newImages.trash()).getHTML() + "&nbsp;Delete (Trash)</span>", true, new Command() {
 
                        public void execute() {
                                if (toCopy instanceof FolderResource){
@@ -112,7 +114,7 @@ public class DnDFolderPopupMenu extends PopupPanel {
                        }
 
                }).setVisible(target == null);
-               contextMenu.addItem("<span>" + newImages.delete().getHTML() + "&nbsp;Cancel</span>", true, cancelCmd);
+               contextMenu.addItem("<span>" + AbstractImagePrototype.create(newImages.delete()).getHTML() + "&nbsp;Cancel</span>", true, cancelCmd);
 
                add(contextMenu);
 
@@ -209,7 +211,7 @@ public class DnDFolderPopupMenu extends PopupPanel {
                String target = ftarget.getUri();
                target = target.endsWith("/") ? target : target + '/';
                for (FileResource fileResource : files) {
-                       String fileTarget = target + fileResource.getName();
+                       String fileTarget = target + URL.encodeComponent(fileResource.getName());
                        fileIds.add(fileResource.getUri() + "?copy=" + fileTarget);
                }
                int index = 0;
@@ -222,7 +224,7 @@ public class DnDFolderPopupMenu extends PopupPanel {
                String target = ftarget.getUri();
                target = target.endsWith("/") ? target : target + '/';
                for (FileResource fileResource : files) {
-                       String fileTarget = target + fileResource.getName();
+                       String fileTarget = target + URL.encodeComponent(fileResource.getName());
                        fileIds.add(fileResource.getUri() + "?move=" + fileTarget);
                }
                int index = 0;