Added refresh to context menus

diff --git a/src/gr/grnet/pithos/web/client/FolderContextMenu.java b/src/gr/grnet/pithos/web/client/FolderContextMenu.java
index a915c95..a717dec 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FolderContextMenu.java
+++ b/src/gr/grnet/pithos/web/client/FolderContextMenu.java
@@ -34,8 +34,6 @@
  */
 package gr.grnet.pithos.web.client;
 
-import java.util.List;
-
 import gr.grnet.pithos.web.client.commands.CopyCommand;
 import gr.grnet.pithos.web.client.commands.CutCommand;
 import gr.grnet.pithos.web.client.commands.DeleteCommand;
@@ -43,11 +41,14 @@ import gr.grnet.pithos.web.client.commands.EmptyTrashCommand;
 import gr.grnet.pithos.web.client.commands.NewFolderCommand;
 import gr.grnet.pithos.web.client.commands.PasteCommand;
 import gr.grnet.pithos.web.client.commands.PropertiesCommand;
+import gr.grnet.pithos.web.client.commands.RefreshCommand;
 import gr.grnet.pithos.web.client.commands.RestoreTrashCommand;
 import gr.grnet.pithos.web.client.commands.ToTrashCommand;
 import gr.grnet.pithos.web.client.foldertree.File;
 import gr.grnet.pithos.web.client.foldertree.Folder;
 
+import java.util.List;
+
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
 import com.google.gwt.user.client.ui.MenuBar;
 import com.google.gwt.user.client.ui.MenuItem;
@@ -88,7 +89,13 @@ public class FolderContextMenu extends PopupPanel {
         Boolean[] permissions = folder.getPermissions().get(app.getUsername());
        boolean canWrite = folder.getOwner().equals(app.getUsername()) || (permissions!= null && permissions[1] != null && permissions[1]);
        boolean isFolderTreeSelected = selectedTree.equals(app.getFolderTreeView());
+       boolean otherSharedTreeSelected = selectedTree.equals(app.getOtherSharedTreeView());
        
+       if (isFolderTreeSelected || otherSharedTreeSelected) {
+               MenuItem refresh = new MenuItem("<span id = 'folderContextMenu.refresh'>" + AbstractImagePrototype.create(images.refresh()).getHTML() + "&nbsp;Refresh</span>", true, new RefreshCommand(app, this, folder));
+               contextMenu.addItem(refresh);
+       }
+
         if (!folder.isInTrash()) {
                if (canWrite) {
                        MenuItem newFolder = new MenuItem("<span id = 'folderContextMenu.newFolder'>" + AbstractImagePrototype.create(newImages.folderNew()).getHTML() + "&nbsp;New Folder</span>", true, new NewFolderCommand(app, this, folder, images));
@@ -148,14 +155,6 @@ public class FolderContextMenu extends PopupPanel {
                        contextMenu.addItem(emptyTrash);
                }
         }
-
-//        MenuItem refresh = new MenuItem("<span id = 'folderContextMenu.refresh'>" + AbstractImagePrototype.create(images.refresh()).getHTML() + "&nbsp;Refresh</span>", true, new RefreshCommand(this, images));
-//        contextMenu.addItem(refresh);
-
-//        MenuItem sharing = new MenuItem("<span id = 'folderContextMenu.sharing'>" + AbstractImagePrototype.create(newImages.sharing()).getHTML() + "&nbsp;Sharing</span>", true, new PropertiesCommand(this, newImages, 1));
-//        contextMenu.addItem(sharing);
-
-
                add(contextMenu);
        }
 }

diff --git a/src/gr/grnet/pithos/web/client/commands/RefreshCommand.java b/src/gr/grnet/pithos/web/client/commands/RefreshCommand.java
index 86dcacf..7403d74 100644 (file)
--- a/src/gr/grnet/pithos/web/client/commands/RefreshCommand.java
+++ b/src/gr/grnet/pithos/web/client/commands/RefreshCommand.java
@@ -34,8 +34,8 @@
  */
 package gr.grnet.pithos.web.client.commands;
 
-import gr.grnet.pithos.web.client.FileContextMenu;
 import gr.grnet.pithos.web.client.Pithos;
+import gr.grnet.pithos.web.client.foldertree.Folder;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.PopupPanel;
@@ -43,37 +43,25 @@ import com.google.gwt.user.client.ui.PopupPanel;
 
 public class RefreshCommand implements Command {
 
-       final FileContextMenu.Images newImages;
-
        private PopupPanel containerPanel;
 
     private Pithos app;
 
+    private Folder folder;
+    
        /**
         * @param _containerPanel
-        * @param _newImages the images of all the possible delete dialogs
         */
-       public RefreshCommand(Pithos _app, PopupPanel _containerPanel, final FileContextMenu.Images _newImages) {
+       public RefreshCommand(Pithos _app, PopupPanel _containerPanel, Folder _folder) {
         app = _app;
                containerPanel = _containerPanel;
-               newImages = _newImages;
+               folder = _folder;
        }
 
        @Override
        public void execute() {
-               containerPanel.hide();
-//             if (app.getCurrentSelection() instanceof FileResource || app.getCurrentSelection() instanceof List)
-//                     app.showFileList(true);
-//             else if (app.getCurrentSelection() instanceof GroupUserResource)
-//                     return;
-//             else{
-//                     //TODO:CELLTREE
-//                     //DnDTreeItem selectedTreeItem = (DnDTreeItem) app.getFolders().getCurrent();
-//                     //if(selectedTreeItem != null){
-//                             //app.getFolders().updateFolder(selectedTreeItem);
-//                     app.getTreeView().updateNode(app.getTreeView().getSelection());
-//                             app.showFileList(true);
-//                     //}
-//             }
+               if (containerPanel != null)
+                       containerPanel.hide();
+               app.updateFolder(folder, true, null);
        }
 }