Temporarily disabled contect menus for trash folder

diff --git a/web_client/src/gr/grnet/pithos/web/client/FileContextMenu.java b/web_client/src/gr/grnet/pithos/web/client/FileContextMenu.java
index 84337f9..c473951 100644 (file)
--- a/web_client/src/gr/grnet/pithos/web/client/FileContextMenu.java
+++ b/web_client/src/gr/grnet/pithos/web/client/FileContextMenu.java
@@ -172,7 +172,8 @@ public class FileContextMenu extends PopupPanel {
 
             contextMenu.addItem(new MenuItem("<span>" + AbstractImagePrototype.create(newImages.viewText()).getHTML() + "&nbsp;Properties</span>", true, new PropertiesCommand(GSS.get(), this, selectedFiles, images, 0)));
 
-                       contextMenu.addItem(new MenuItem("<span><a class='hidden-link' href='" + GSS.get().getApiPath() + GSS.get().getUsername() + selectedFiles.get(0).getUri() + "?X-Auth-Token=" + GSS.get().getToken() + "' target='_blank'>" + AbstractImagePrototype.create(newImages.download()).getHTML() + " Download</a></span>", true, (Command) null));
+            if (!selectedFiles.isEmpty())
+                           contextMenu.addItem(new MenuItem("<span><a class='hidden-link' href='" + GSS.get().getApiPath() + GSS.get().getUsername() + selectedFiles.get(0).getUri() + "?X-Auth-Token=" + GSS.get().getToken() + "' target='_blank'>" + AbstractImagePrototype.create(newImages.download()).getHTML() + " Download</a></span>", true, (Command) null));
 
                        MenuItem unSelect = new MenuItem("<span>" + AbstractImagePrototype.create(images.unselectAll()).getHTML() + "&nbsp;Unselect</span>", true, new Command() {
                 @Override

diff --git a/web_client/src/gr/grnet/pithos/web/client/FileList.java b/web_client/src/gr/grnet/pithos/web/client/FileList.java
index 41c5cc1..aaeaeb8 100644 (file)
--- a/web_client/src/gr/grnet/pithos/web/client/FileList.java
+++ b/web_client/src/gr/grnet/pithos/web/client/FileList.java
@@ -447,11 +447,14 @@ public class FileList extends Composite {
         vp.addHandler(new ContextMenuHandler() {
             @Override
             public void onContextMenu(ContextMenuEvent event) {
-                FileContextMenu contextMenu = new FileContextMenu(images, treeView.getSelection(), getSelectedFiles(), false);
-                int x = event.getNativeEvent().getClientX();
-                int y = event.getNativeEvent().getClientY();
-                contextMenu.setPopupPosition(x, y);
-                contextMenu.show();
+                Folder selectedFolder = treeView.getSelection();
+                if (!selectedFolder.isTrash()) {
+                    FileContextMenu contextMenu = new FileContextMenu(images, selectedFolder, getSelectedFiles(), false);
+                    int x = event.getNativeEvent().getClientX();
+                    int y = event.getNativeEvent().getClientY();
+                    contextMenu.setPopupPosition(x, y);
+                    contextMenu.show();
+                }
             }
         }, ContextMenuEvent.getType());
                initWidget(vp);

diff --git a/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
index 064dd67..de62755 100644 (file)
--- a/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
+++ b/web_client/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
@@ -75,9 +75,11 @@ public class FolderTreeViewModel implements TreeViewModel {
         public void onBrowserEvent(Cell.Context context, com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, com.google.gwt.cell.client.ValueUpdater<Folder> valueUpdater) {
             if (event.getType().equals(ContextMenuEvent.getType().getName())) {
                 FolderTreeViewModel.this.selectionModel.setSelected(folder, true);
-                FolderContextMenu menu = new FolderContextMenu(FolderTreeView.images, folder);
-                menu.setPopupPosition(event.getClientX(), event.getClientY());
-                menu.show();
+                if (!folder.isTrash()) {
+                    FolderContextMenu menu = new FolderContextMenu(FolderTreeView.images, folder);
+                    menu.setPopupPosition(event.getClientX(), event.getClientY());
+                    menu.show();
+                }
             }
         }
     };