Various CSS and cosmetic fixes
[pithos-web-client] / src / gr / grnet / pithos / web / client / othersharedtree / OtherSharedTreeViewModel.java
index 89eb4c1..588f1cc 100644 (file)
@@ -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
@@ -41,6 +41,7 @@ import gr.grnet.pithos.web.client.SharingUsers;
 import gr.grnet.pithos.web.client.foldertree.AccountResource;
 import gr.grnet.pithos.web.client.foldertree.File;
 import gr.grnet.pithos.web.client.foldertree.Folder;
+import gr.grnet.pithos.web.client.mysharedtree.MysharedTreeView;
 import gr.grnet.pithos.web.client.othersharedtree.OtherSharedTreeView.Templates;
 import gr.grnet.pithos.web.client.rest.GetRequest;
 import gr.grnet.pithos.web.client.rest.RestException;
@@ -58,6 +59,8 @@ import com.google.gwt.cell.client.ValueUpdater;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.event.dom.client.ContextMenuEvent;
+import com.google.gwt.http.client.Response;
+import com.google.gwt.http.client.URL;
 import com.google.gwt.safehtml.shared.SafeHtml;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.text.shared.SafeHtmlRenderer;
@@ -73,22 +76,32 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
 
     protected Pithos app;
 
+    String dummy = "No shares by others yet";
+
     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 = AbstractImagePrototype.create(OtherSharedTreeView.images.folderYellow()).getHTML();
-            safeHtmlBuilder.appendHtmlConstant(html);
+               safeHtmlBuilder.appendHtmlConstant(html).appendHtmlConstant("&nbsp;");
             safeHtmlBuilder.append(Templates.INSTANCE.nameSpan(folder.getName()));
         }
 
         @Override
-        public void onBrowserEvent(@SuppressWarnings("unused") Context context, @SuppressWarnings("unused") com.google.gwt.dom.client.Element parent, Folder folder, com.google.gwt.dom.client.NativeEvent event, @SuppressWarnings("unused") ValueUpdater<Folder> valueUpdater) {
+        public void onBrowserEvent(Context context, com.google.gwt.dom.client.Element parent, final Folder folder, com.google.gwt.dom.client.NativeEvent event, ValueUpdater<Folder> valueUpdater) {
             if (event.getType().equals(ContextMenuEvent.getType().getName())) {
+               final int x = event.getClientX();
+               final int y = event.getClientY();
                 OtherSharedTreeViewModel.this.selectionModel.setSelected(folder, true);
-                FolderContextMenu menu = new FolderContextMenu(app, OtherSharedTreeView.images, folder);
-                menu.setPopupPosition(event.getClientX(), event.getClientY());
-                menu.show();
+                app.scheduleFolderHeadCommand(folder, new Command() {
+                                       
+                                       @Override
+                                       public void execute() {
+                               FolderContextMenu menu = new FolderContextMenu(app, OtherSharedTreeView.images, app.getSelectedTree(), folder);
+                               menu.setPopupPosition(x, y);
+                               menu.show();
+                                       }
+                               });
             }
         }
     };
@@ -99,8 +112,6 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
     protected Map<String, ListDataProvider<Folder>> userDataProviderMap = new HashMap<String, ListDataProvider<Folder>>();
     private Map<Folder, ListDataProvider<Folder>> dataProviderMap = new HashMap<Folder, ListDataProvider<Folder>>();
     
-    protected Map<String, Set<File>> sharedFiles = new HashMap<String, Set<File>>();
-
     protected SingleSelectionModel<Folder> selectionModel;
 
     public OtherSharedTreeViewModel(Pithos _app, SingleSelectionModel<Folder> selectionModel) {
@@ -111,74 +122,33 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
     @Override
     public <T> NodeInfo<?> getNodeInfo(T value) {
         if (value == null) {
-            rootDataProvider.getList().add("Other 's Shared");
-            final SingleSelectionModel<String> selectionModel2 = new SingleSelectionModel<String>();
-            selectionModel2.addSelectionChangeHandler(new Handler() {
+               fetchSharingUsers(null);
+            return new DefaultNodeInfo<String>(userLevelDataProvider, new TextCell(new SafeHtmlRenderer<String>() {
 
-                @Override
-                public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
-                    if (selectionModel2.getSelectedObject() != null) {
-                       app.deselectOthers(selectionModel2);
-                       app.showFiles(new HashSet<File>());
-                    }
-                }
-            });
-            app.addSelectionModel(selectionModel2);
-            return new DefaultNodeInfo<String>(rootDataProvider, new TextCell(new SafeHtmlRenderer<String>() {
-                @Override
-                public SafeHtml render(String object) {
+                               @Override
+                               public SafeHtml render(String object) {
                     SafeHtmlBuilder builder = new SafeHtmlBuilder();
                     render(object, builder);
                     return builder.toSafeHtml();
-                }
+                               }
 
-                @Override
-                public void render(String object, SafeHtmlBuilder builder) {
-                    String html = AbstractImagePrototype.create(OtherSharedTreeView.images.othersShared()).getHTML();
-                    builder.appendHtmlConstant(html);
+                               @Override
+                               public void render(String object, SafeHtmlBuilder builder) {
+                    if (!object.equals(dummy)) {
+                       String html = AbstractImagePrototype.create(OtherSharedTreeView.images.myShared()).getHTML();
+                       builder.appendHtmlConstant(html).appendHtmlConstant("&nbsp;");
+                    }
                     builder.append(OtherSharedTreeView.Templates.INSTANCE.nameSpan(object));
-                }
-            }),  selectionModel2, null);
+                               }
+                       }), null, null);
         }
         else if (value instanceof String) {
-               if (value.equals("Other 's Shared")) {
-                       fetchSharingUsers();
-                   final SingleSelectionModel<String> selectionModel3 = new SingleSelectionModel<String>();
-                   selectionModel3.addSelectionChangeHandler(new Handler() {
-
-                       @Override
-                       public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
-                           if (selectionModel3.getSelectedObject() != null) {
-                               app.deselectOthers(selectionModel3);
-                               String username = selectionModel3.getSelectedObject();
-                               fetchSharedFiles(username, userDataProviderMap.get(username));
-                           }
-                       }
-                   });
-                   app.addSelectionModel(selectionModel3);
-                   return new DefaultNodeInfo<String>(userLevelDataProvider, new TextCell(new SafeHtmlRenderer<String>() {
-
-                                       @Override
-                                       public SafeHtml render(String object) {
-                           SafeHtmlBuilder builder = new SafeHtmlBuilder();
-                           render(object, builder);
-                           return builder.toSafeHtml();
-                                       }
-
-                                       @Override
-                                       public void render(String object, SafeHtmlBuilder builder) {
-                           String html = AbstractImagePrototype.create(OtherSharedTreeView.images.user()).getHTML();
-                           builder.appendHtmlConstant(html);
-                           builder.append(OtherSharedTreeView.Templates.INSTANCE.nameSpan(object));
-                                       }
-                               }), selectionModel3, null);
-               }
                        String username = (String) value;
                        if (userDataProviderMap.get(username) == null) {
                                userDataProviderMap.put(username, new ListDataProvider<Folder>());
                        }
                        final ListDataProvider<Folder> dataProvider = userDataProviderMap.get(username);
-                       fetchSharedContainers(username, dataProvider);
+                       fetchSharedContainers(username, dataProvider, null);
                        return new DefaultNodeInfo<Folder>(dataProvider, folderCell, selectionModel, null);
         }
         else {
@@ -192,40 +162,75 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
         }
     }
 
-    private void fetchSharingUsers() {
+    private void fetchSharingUsers(final Command callback) {
         GetRequest<SharingUsers> getSharingUsers = new GetRequest<SharingUsers>(SharingUsers.class, app.getApiPath(), "", "?format=json") {
             @Override
             public void onSuccess(final SharingUsers _result) {
                 userLevelDataProvider.getList().clear();
                 userLevelDataProvider.getList().addAll(_result.getUsers());
-                for (String name : _result.getUsers()) {
-                       sharedFiles.put(name, new HashSet<File>());
-                }
+                if (userLevelDataProvider.getList().isEmpty())
+                       userLevelDataProvider.getList().add(dummy);
+                Iterator<String> iter = _result.getUsers().iterator();
+                fetchSharedContainers(iter, callback);
             }
 
             @Override
             public void onError(Throwable t) {
                 GWT.log("Error getting folder", t);
+                               app.setError(t);
                 if (t instanceof RestException)
                     app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText());
                 else
                     app.displayError("System error fetching folder: " + t.getMessage());
             }
+
+                       @Override
+                       protected void onUnauthorized(Response response) {
+                               app.sessionExpired();
+                       }
         };
         getSharingUsers.setHeader("X-Auth-Token", app.getToken());
         Scheduler.get().scheduleDeferred(getSharingUsers);
        }
 
+       protected void fetchSharedContainers(final Iterator<String> iter, final Command callback) {
+               if (iter.hasNext()) {
+                       String username = iter.next();
+                       if (userDataProviderMap.get(username) == null) {
+                               userDataProviderMap.put(username, new ListDataProvider<Folder>());
+                       }
+                       final ListDataProvider<Folder> dataProvider = userDataProviderMap.get(username);
+                       fetchSharedContainers(username, dataProvider, new Command() {
+                               
+                               @Override
+                               public void execute() {
+                                       fetchSharedContainers(iter, callback);
+                                       
+                               }
+                       });
+               }
+               else
+                       if (callback != null)
+                               callback.execute();
+       }
+
        @Override
     public boolean isLeaf(Object o) {
-        if (o instanceof Folder) {
+               if (o == null)
+                       return userLevelDataProvider.getList().isEmpty();
+               else if (o instanceof Folder) {
             Folder f = (Folder) o;
             return f.getSubfolders().isEmpty();
         }
-        return false;
+               else {
+                       ListDataProvider<Folder> dp = userDataProviderMap.get(o);
+                       if (dp != null)
+                               return dp.getList().isEmpty();
+                       return true;
+               }
     }
 
-       private void fetchSharedContainers(final String username, final ListDataProvider<Folder> dataProvider) {
+       private void fetchSharedContainers(final String username, final ListDataProvider<Folder> dataProvider, final Command callback) {
                GetRequest<AccountResource> getUserSharedContainers = new GetRequest<AccountResource>(AccountResource.class, app.getApiPath(), username, "?format=json") {
 
                        @Override
@@ -238,6 +243,8 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
                                        public void execute() {
                                                dataProvider.getList().clear();
                                                dataProvider.getList().addAll(tempProvider.getList());
+                                               if (callback != null)
+                                                       callback.execute();
                                        }
                                });
                        }
@@ -245,41 +252,16 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
                        @Override
                        public void onError(Throwable t) {
                 GWT.log("Error getting account", t);
+                               app.setError(t);
                 if (t instanceof RestException)
                     app.displayError("Error getting account: " + ((RestException) t).getHttpStatusText());
                 else
                     app.displayError("System error fetching user data: " + t.getMessage());
                        }
-               };
-               getUserSharedContainers.setHeader("X-Auth-Token", app.getToken());
-               Scheduler.get().scheduleDeferred(getUserSharedContainers);
-       }
-
-       protected void fetchSharedFiles(final String username, final ListDataProvider<Folder> dataProvider) {
-               GetRequest<AccountResource> getUserSharedContainers = new GetRequest<AccountResource>(AccountResource.class, app.getApiPath(), username, "?format=json") {
-
-                       @Override
-                       public void onSuccess(AccountResource _result) {
-                       final ListDataProvider<Folder> tempProvider = new ListDataProvider<Folder>();
-                               Iterator<Folder> iter = _result.getContainers().iterator();
-                               fetchFolder(username, iter, tempProvider, new Command() {
-                                       
-                                       @Override
-                                       public void execute() {
-                                               dataProvider.getList().clear();
-                                               dataProvider.getList().addAll(tempProvider.getList());
-                                               app.showFiles(sharedFiles.get(username));
-                                       }
-                               });
-                       }
 
                        @Override
-                       public void onError(Throwable t) {
-                GWT.log("Error getting account", t);
-                if (t instanceof RestException)
-                    app.displayError("Error getting account: " + ((RestException) t).getHttpStatusText());
-                else
-                    app.displayError("System error fetching user data: " + t.getMessage());
+                       protected void onUnauthorized(Response response) {
+                               app.sessionExpired();
                        }
                };
                getUserSharedContainers.setHeader("X-Auth-Token", app.getToken());
@@ -290,38 +272,28 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
         if (iter.hasNext()) {
             final Folder f = iter.next();
 
-            String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix();
+            String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(f.getPrefix());
             GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, app.getApiPath(), username, path, f) {
                 @Override
                 public void onSuccess(Folder _result) {
-                       if (!_result.isShared()) {
-                               for (File file : _result.getFiles()) {
-                                       if (file.isShared())
-                                               sharedFiles.get(username).add(file);
-                               }
-                               Iterator<Folder> iter2 = _result.getSubfolders().iterator();
-                               fetchFolder(username, iter2, dataProvider, new Command() {
-                                                       
-                                                       @Override
-                                                       public void execute() {
-                                           fetchFolder(username, iter, dataProvider, callback);
-                                                       }
-                                               });
-                       }
-                       else {
-                               dataProvider.getList().add(_result);
-                           fetchFolder(username, iter, dataProvider, callback);
-                       }
+                               dataProvider.getList().add(_result);
+                    fetchFolder(username, iter, dataProvider, callback);
                 }
 
                 @Override
                 public void onError(Throwable t) {
                     GWT.log("Error getting folder", t);
+                                       app.setError(t);
                     if (t instanceof RestException)
                         app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText());
                     else
                         app.displayError("System error fetching folder: " + t.getMessage());
                 }
+
+                               @Override
+                               protected void onUnauthorized(Response response) {
+                                       app.sessionExpired();
+                               }
             };
             getFolder.setHeader("X-Auth-Token", app.getToken());
             Scheduler.get().scheduleDeferred(getFolder);
@@ -343,7 +315,7 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
     }
 
     public void fetchFolder(final Folder f, final ListDataProvider<Folder> dataProvider, final boolean showfiles) {
-        String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix();
+        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(final Folder _result) {
@@ -363,13 +335,23 @@ public class OtherSharedTreeViewModel implements TreeViewModel {
             @Override
             public void onError(Throwable t) {
                 GWT.log("Error getting folder", t);
+                               app.setError(t);
                 if (t instanceof RestException)
                     app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText());
                 else
                     app.displayError("System error fetching folder: " + t.getMessage());
             }
+
+                       @Override
+                       protected void onUnauthorized(Response response) {
+                               app.sessionExpired();
+                       }
         };
         getFolder.setHeader("X-Auth-Token", app.getToken());
         Scheduler.get().scheduleDeferred(getFolder);
     }
+    
+    public void initialize(Command callback) {
+       fetchSharingUsers(callback);
+    }
 }