Fixed username in all API calls + some other fixes

[pithos-web-client] / src / gr / grnet / pithos / web / client / FileList.java

diff --git a/src/gr/grnet/pithos/web/client/FileList.java b/src/gr/grnet/pithos/web/client/FileList.java
index 7031544..d614f30 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FileList.java
+++ b/src/gr/grnet/pithos/web/client/FileList.java
@@ -314,14 +314,15 @@ public class FileList extends Composite {
         vp.addHandler(new ContextMenuHandler() {
             @Override
             public void onContextMenu(ContextMenuEvent event) {
-                Folder selectedFolder = treeView.getSelection();
-                if (!selectedFolder.isTrash()) {
-                    FileContextMenu contextMenu = new FileContextMenu(app, images, selectedFolder, getSelectedFiles(), false);
-                    int x = event.getNativeEvent().getClientX();
-                    int y = event.getNativeEvent().getClientY();
-                    contextMenu.setPopupPosition(x, y);
-                    contextMenu.show();
-                }
+               TreeView tree = app.getSelectedTree();
+               if (tree != null && (tree.equals(app.getFolderTreeView()) || tree.equals(app.getOtherSharedTreeView()))) {
+                       Folder selectedFolder = app.getSelection();
+                       FileContextMenu contextMenu = new FileContextMenu(app, images, tree, selectedFolder, getSelectedFiles(), false);
+                       int x = event.getNativeEvent().getClientX();
+                       int y = event.getNativeEvent().getClientY();
+                       contextMenu.setPopupPosition(x, y);
+                       contextMenu.show();
+               }
             }
         }, ContextMenuEvent.getType());
                initWidget(vp);
@@ -430,8 +431,7 @@ public class FileList extends Composite {
        public void setFiles(final List<File> _files) {
                files = new ArrayList<File>();
        for (File fres : _files)
-               if (!fres.isInTrash())
-                               files.add(fres);
+                       files.add(fres);
                Collections.sort(files, new Comparator<File>() {
 
                        @Override