Permissions are requested just before showing the contect and tools menu (issue ...

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

diff --git a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
index 0fb166b..5035473 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 GRNET S.A. All rights reserved.
+ * Copyright 2011-2012 GRNET S.A. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
@@ -43,7 +43,6 @@ import gr.grnet.pithos.web.client.rest.RestException;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -58,10 +57,6 @@ import com.google.gwt.safehtml.shared.SafeHtml;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.UIObject;
-import com.google.gwt.view.client.AsyncDataProvider;
-import com.google.gwt.view.client.HasData;
 import com.google.gwt.view.client.ListDataProvider;
 import com.google.gwt.view.client.SingleSelectionModel;
 import com.google.gwt.view.client.TreeViewModel;
@@ -73,7 +68,7 @@ public class FolderTreeViewModel implements TreeViewModel {
     private Cell<Folder> folderCell = new AbstractCell<Folder>(ContextMenuEvent.getType().getName()) {
 
        @Override
-        public void render(@SuppressWarnings("unused") Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) {
+        public void render(Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) {
             String html;
             SafeHtml name;
                if (folder.isHome()) {
@@ -93,12 +88,20 @@ public class FolderTreeViewModel implements TreeViewModel {
         }
 
         @Override
-        public void onBrowserEvent(@SuppressWarnings("unused") Cell.Context context, @SuppressWarnings("unused") com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, @SuppressWarnings("unused") com.google.gwt.cell.client.ValueUpdater<Folder> valueUpdater) {
+        public void onBrowserEvent(Cell.Context context, com.google.gwt.dom.client.Element parent, final Folder folder, com.google.gwt.dom.client.NativeEvent event, com.google.gwt.cell.client.ValueUpdater<Folder> valueUpdater) {
             if (event.getType().equals(ContextMenuEvent.getType().getName())) {
+               final int x = event.getClientX();
+               final int y = event.getClientY();
                 FolderTreeViewModel.this.selectionModel.setSelected(folder, true);
-                FolderContextMenu menu = new FolderContextMenu(app, FolderTreeView.images, app.getSelectedTree(), folder);
-                menu.setPopupPosition(event.getClientX(), event.getClientY());
-                menu.show();
+                app.scheduleFolderHeadCommand(folder, new Command() {
+                                       
+                                       @Override
+                                       public void execute() {
+                               FolderContextMenu menu = new FolderContextMenu(app, FolderTreeView.images, app.getSelectedTree(), folder);
+                               menu.setPopupPosition(x, y);
+                               menu.show();
+                                       }
+                               });
             }
         }
     };
@@ -142,6 +145,10 @@ public class FolderTreeViewModel implements TreeViewModel {
         return false;
     }
 
+       private native void log(String msg) /*-{
+       $wnd.console.log(msg);
+       }-*/;
+
     protected void fetchFolder(final Iterator<Folder> iter, final Command callback) {
         if (iter.hasNext()) {
             final Folder f = iter.next();
@@ -149,7 +156,7 @@ public class FolderTreeViewModel implements TreeViewModel {
             String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(f.getPrefix());
             GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, app.getApiPath(), f.getOwner(), path, f) {
                 @Override
-                public void onSuccess(@SuppressWarnings("unused") Folder _result) {
+                public void onSuccess(Folder _result) {
                     fetchFolder(iter, callback);
                 }
 
@@ -176,7 +183,7 @@ public class FolderTreeViewModel implements TreeViewModel {
     }
 
     public void initialize(final AccountResource account, final Command callback) {
-        Iterator<Folder> iter = account.getContainers().iterator();
+        Iterator<Folder> iter = account.getContainers().listIterator();
         fetchFolder(iter, new Command() {
             @Override
             public void execute() {
@@ -226,7 +233,7 @@ public class FolderTreeViewModel implements TreeViewModel {
             public void onSuccess(final Folder _result) {
                 if (showfiles)
                     app.showFiles(_result);
-                Iterator<Folder> iter = _result.getSubfolders().iterator();
+                Iterator<Folder> iter = new ArrayList<Folder>(_result.getSubfolders()).listIterator();
                 fetchFolder(iter, new Command() {
                     @Override
                     public void execute() {