Merge with d1e79f3c8c8779d14ab5297049bdc0812f942654

[pithos] / src / gr / ebs / gss / client / EditMenu.java

diff --git a/src/gr/ebs/gss/client/EditMenu.java b/src/gr/ebs/gss/client/EditMenu.java
index 226d7cb..4ada1bd 100644 (file)
--- a/src/gr/ebs/gss/client/EditMenu.java
+++ b/src/gr/ebs/gss/client/EditMenu.java
@@ -195,7 +195,7 @@ public class EditMenu extends PopupPanel implements ClickListener {
                        else if(!GSS.get().isUserListVisible() && GSS.get().getClipboard().getItem().getUser() != null){\r
                                //do not show paste\r
                        }\r
-                       else\r
+                       else if (GSS.get().getFolders().getCurrent().getUserObject() instanceof FolderResource)\r
                                contextMenu.addItem("<span>" + images.paste().getHTML() + "&nbsp;"+pasteLabel+"</span>", true, new PasteCommand(this));\r
                contextMenu     .addItem("<span>" + images.emptyTrash().getHTML() + "&nbsp;Move to Trash</span>", true, new ToTrashCommand(this))\r
                                        .setVisible(cutcopyVisible);\r