/*
- * Copyright 2011-2012 GRNET S.A. All rights reserved.
+ * Copyright 2011-2013 GRNET S.A. All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
package gr.grnet.pithos.web.client.othersharedtree;
-import gr.grnet.pithos.web.client.FolderContextMenu;
-import gr.grnet.pithos.web.client.Pithos;
-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;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
import com.google.gwt.cell.client.AbstractCell;
import com.google.gwt.cell.client.Cell;
import com.google.gwt.cell.client.TextCell;
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.Request;
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.user.client.Command;
import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.view.client.ListDataProvider;
-import com.google.gwt.view.client.SelectionChangeEvent;
-import com.google.gwt.view.client.SelectionChangeEvent.Handler;
import com.google.gwt.view.client.SingleSelectionModel;
import com.google.gwt.view.client.TreeViewModel;
+import gr.grnet.pithos.web.client.Const;
+import gr.grnet.pithos.web.client.FolderContextMenu;
+import gr.grnet.pithos.web.client.Pithos;
+import gr.grnet.pithos.web.client.SharingUsers;
+import gr.grnet.pithos.web.client.catalog.UpdateUserCatalogs;
+import gr.grnet.pithos.web.client.catalog.UserCatalogs;
+import gr.grnet.pithos.web.client.foldertree.AccountResource;
+import gr.grnet.pithos.web.client.foldertree.Folder;
+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;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
public class OtherSharedTreeViewModel implements TreeViewModel {
- private static final String treeTitle = "Shared to me";
protected Pithos app;
+ final String dummy = "No shares by others yet";
+
private Cell<Folder> folderCell = new AbstractCell<Folder>(ContextMenuEvent.getType().getName()) {
- @Override
+ @Override
public void render(Context context, Folder folder, SafeHtmlBuilder safeHtmlBuilder) {
+// app.LOG("OtherSharedTreeViewModel::render(), folder=", folder);
String html = AbstractImagePrototype.create(OtherSharedTreeView.images.folderYellow()).getHTML();
safeHtmlBuilder.appendHtmlConstant(html).appendHtmlConstant(" ");
safeHtmlBuilder.append(Templates.INSTANCE.nameSpan(folder.getName()));
@Override
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();
+ app.LOG("OtherSharedTreeViewModel::render(), folder=", folder, ", parent=", parent.getString());
+ if(event.getType().equals(ContextMenuEvent.getType().getName())) {
+ final int x = event.getClientX();
+ final int y = event.getClientY();
OtherSharedTreeViewModel.this.selectionModel.setSelected(folder, true);
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();
- }
- });
+
+ @Override
+ public void execute() {
+ FolderContextMenu menu = new FolderContextMenu(app, OtherSharedTreeView.images, app.getSelectedTree(), folder);
+ menu.setPopupPosition(x, y);
+ menu.show();
+ }
+ });
}
}
};
- private ListDataProvider<String> rootDataProvider = new ListDataProvider<String>();
- protected ListDataProvider<String> userLevelDataProvider = new ListDataProvider<String>();
+ protected ListDataProvider<String> userLevelDataProviderForIDs = new ListDataProvider<String>();
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;
@Override
public <T> NodeInfo<?> getNodeInfo(T value) {
- if (value == null) {
- rootDataProvider.getList().add(treeTitle);
- final SingleSelectionModel<String> selectionModel2 = new SingleSelectionModel<String>();
- selectionModel2.addSelectionChangeHandler(new Handler() {
-
- @Override
- public void onSelectionChange(SelectionChangeEvent event) {
- if (selectionModel2.getSelectedObject() != null) {
- app.deselectOthers(app.getOtherSharedTreeView(), selectionModel2);
- app.applyPermissions(null);
- app.showFiles(new HashSet<File>());
- app.showRelevantToolbarButtons();
- }
- else {
- if (app.getSelectedTree().equals(app.getOtherSharedTreeView()) && app.getOtherSharedTreeView().getSelection() == null)
- app.setSelectedTree(null);
- if (app.getSelectedTree() == null)
- app.showRelevantToolbarButtons();
- }
- }
- });
- app.addSelectionModel(selectionModel2);
- return new DefaultNodeInfo<String>(rootDataProvider, new TextCell(new SafeHtmlRenderer<String>() {
+ if(value == null) {
+ app.LOG("OtherSharedTreeViewModel::getNodeInfo(null), calling fetchSharingUsers(null)");
+ fetchSharingUsers(null);
+ app.LOG("OtherSharedTreeViewModel::getNodeInfo(null), called fetchSharingUsers(null)");
+ return new DefaultNodeInfo<String>(userLevelDataProviderForIDs, new TextCell(new SafeHtmlRenderer<String>() {
@Override
public SafeHtml render(String object) {
+ final String displayName = app.getDisplayNameForUserID(object);
+ app.LOG("OtherSharedTreeViewModel::(getNodeInfo)render(String ", object, "), parameter is userID, displayName=", displayName);
SafeHtmlBuilder builder = new SafeHtmlBuilder();
- render(object, builder);
+ render(displayName, builder);
return builder.toSafeHtml();
}
@Override
public void render(String object, SafeHtmlBuilder builder) {
- String html = AbstractImagePrototype.create(OtherSharedTreeView.images.othersShared()).getHTML();
- builder.appendHtmlConstant(html).appendHtmlConstant(" ");
+ if(!object.equals(dummy)) {
+ app.LOG("OtherSharedTreeViewModel::(getNodeInfo)render(String ", object, ") parameter is not [dummy]");
+ String html = AbstractImagePrototype.create(OtherSharedTreeView.images.myShared()).getHTML();
+ builder.appendHtmlConstant(html).appendHtmlConstant(" ");
+ }
builder.append(OtherSharedTreeView.Templates.INSTANCE.nameSpan(object));
}
- }), selectionModel2, null);
+ }), null, null);
}
- else if (value instanceof String) {
- if (value.equals(treeTitle)) {
- fetchSharingUsers(null);
- final SingleSelectionModel<String> selectionModel3 = new SingleSelectionModel<String>();
- selectionModel3.addSelectionChangeHandler(new Handler() {
-
- @Override
- public void onSelectionChange(SelectionChangeEvent event) {
- if (selectionModel3.getSelectedObject() != null) {
- app.deselectOthers(app.getOtherSharedTreeView(), selectionModel3);
- app.applyPermissions(null);
- String username = selectionModel3.getSelectedObject();
- if (userDataProviderMap.get(username) == null) {
- userDataProviderMap.put(username, new ListDataProvider<Folder>());
- }
- fetchSharedFiles(username, userDataProviderMap.get(username));
- app.showRelevantToolbarButtons();
- }
- else {
- if (app.getSelectedTree().equals(app.getOtherSharedTreeView()) && app.getOtherSharedTreeView().getSelection() == null)
- app.setSelectedTree(null);
- if (app.getSelectedTree() == null)
- app.showRelevantToolbarButtons();
- }
- }
- });
- 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).appendHtmlConstant(" ");
- 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, null);
- return new DefaultNodeInfo<Folder>(dataProvider, folderCell, selectionModel, null);
+ else if(value instanceof String) {
+ app.LOG("OtherSharedTreeViewModel::getNodeInfo(String ", value, "), parameter is userID");
+ final String userID = (String) value;
+
+ if(userDataProviderMap.get(userID) == null) {
+ userDataProviderMap.put(userID, new ListDataProvider<Folder>());
+ }
+ final ListDataProvider<Folder> userIDDataProvider = userDataProviderMap.get(userID);
+ fetchSharedContainers(userID, userIDDataProvider, null);
+
+ return new DefaultNodeInfo<Folder>(userIDDataProvider, folderCell, selectionModel, null);
}
else {
+ app.LOG("OtherSharedTreeViewModel::getNodeInfo(Folder ", value, ")");
final Folder f = (Folder) value;
- if (dataProviderMap.get(f) == null) {
+ if(dataProviderMap.get(f) == null) {
dataProviderMap.put(f, new ListDataProvider<Folder>());
}
final ListDataProvider<Folder> dataProvider = dataProviderMap.get(f);
- fetchFolder(f, dataProvider, false);
+ fetchFolder(f, dataProvider, false, null);
return new DefaultNodeInfo<Folder>(dataProvider, folderCell, selectionModel, null);
}
}
private void fetchSharingUsers(final Command callback) {
- GetRequest<SharingUsers> getSharingUsers = new GetRequest<SharingUsers>(SharingUsers.class, app.getApiPath(), "", "?format=json") {
+ app.LOG("OtherSharedTreeViewModel::fetchSharingUsers() callback=", callback);
+ GetRequest<SharingUsers> getSharingUsers = new GetRequest<SharingUsers>(SharingUsers.class, Pithos.getStorageAPIURL(), "", "?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>());
+ userLevelDataProviderForIDs.getList().clear();
+
+ final List<String> userIDs = _result.getUserIDs();
+ for(String userID : userIDs) {
+ app.LOG("OtherSharedTreeViewModel::fetchSharingUsers()::onSuccess() Sharing userID=", userID);
+ }
+ final List<String> userIDsWithUnknownDisplayNames = app.filterUserIDsWithUnknownDisplayName(userIDs);
+// for(String userID : userIDsWithUnknownDisplayNames) {
+// app.LOG("OtherSharedTreeViewModel::fetchSharingUsers(): userID (with unknown name) =" + userID);
+// }
+
+ userLevelDataProviderForIDs.getList().addAll(userIDs);
+ if(userLevelDataProviderForIDs.getList().isEmpty()) {
+ userLevelDataProviderForIDs.getList().add(dummy);
+ app.LOG("OtherSharedTreeViewModel::fetchSharingUsers()::onSuccess() NO sharing users, adding [dummy]=\"", dummy, "\"");
+
+ // #4140 Must also use the callback before returning!
+ if(callback != null) {
+ try {
+ callback.execute();
+ }
+ catch(Exception e) {
+ Pithos.LOG("Error callback-ing after NO sharing users found", e);
+ }
+ }
+ return; // Only the dummy node is present, nothing to fetch from the server
+ }
+
+ if(userIDsWithUnknownDisplayNames.size() == 0) {
+ // All display names are known, so we proceed directly
+ fetchSharedContainers(userLevelDataProviderForIDs.getList().iterator(), callback);
+ } else {
+ // First fetch unknown display names and then proceed
+ new UpdateUserCatalogs(app, userIDsWithUnknownDisplayNames) {
+ @Override
+ public void onSuccess(UserCatalogs requestedUserCatalogs, UserCatalogs updatedUserCatalogs) {
+ fetchSharedContainers(userLevelDataProviderForIDs.getList().iterator(), callback);
+ }
+
+ @Override
+ public void onError(Request request, Throwable t) {
+ super.onError(request, t);
+ app.setError(t);
+ }
+ }.scheduleDeferred();
}
- 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.setError(t);
+ if(t instanceof RestException) {
app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText());
- else
+ }
+ else {
app.displayError("System error fetching folder: " + t.getMessage());
+ }
}
- @Override
- protected void onUnauthorized(Response response) {
- app.sessionExpired();
- }
+ @Override
+ protected void onUnauthorized(Response response) {
+ app.sessionExpired();
+ }
};
- getSharingUsers.setHeader("X-Auth-Token", app.getToken());
+ getSharingUsers.setHeader(Const.X_AUTH_TOKEN, app.getUserToken());
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
+ }
+
+ protected void fetchSharedContainers(final Iterator<String> userIDsIterator, final Command callback) {
+ app.LOG("OtherSharedTreeViewModel::fetchSharedContainers(), userIDsIterator=", userIDsIterator.hasNext(), ", callback=", callback);
+ if(userIDsIterator.hasNext()) {
+ String userID = userIDsIterator.next();
+ if(userDataProviderMap.get(userID) == null) {
+ userDataProviderMap.put(userID, new ListDataProvider<Folder>());
+ }
+ final ListDataProvider<Folder> dataProvider = userDataProviderMap.get(userID);
+ fetchSharedContainers(userID, dataProvider, new Command() {
+
+ @Override
+ public void execute() {
+ fetchSharedContainers(userIDsIterator, callback);
+
+ }
+ });
+ }
+ else if(callback != null) {
+ callback.execute();
+ }
+ }
+
+ @Override
public boolean isLeaf(Object o) {
- if (o == null)
- return false;
- else if (o instanceof Folder) {
- Folder f = (Folder) o;
- return f.getSubfolders().isEmpty();
+ if(o == null) {
+ boolean result = userLevelDataProviderForIDs.getList().isEmpty();
+// app.LOG("isLeaf(null) ==> " + result);
+ return result;
+ }
+ else if(o instanceof Folder) {
+ Folder folder = (Folder) o;
+ boolean result = folder.getSubfolders().isEmpty();
+// app.LOG("isLeaf(Folder "+folder+") ==> " + result);
+ return result;
+ }
+ else {
+ ListDataProvider<Folder> dp = userDataProviderMap.get(o);
+ if(dp != null) {
+ boolean result = dp.getList().isEmpty();
+// app.LOG("isLeaf("+o.getClass().getName()+" "+o+") ==> " + result);
+ return result;
+ }
+// app.LOG("isLeaf("+o.getClass().getName()+" "+o+") ==> (true)");
+ return true;
}
- else {
- if (o.equals(treeTitle))
- return userLevelDataProvider.getList().isEmpty();
- 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, final Command callback) {
- 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());
- if (callback != null)
- callback.execute();
- }
- });
- }
-
- @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());
- }
-
- @Override
- protected void onUnauthorized(Response response) {
- app.sessionExpired();
- }
- };
- 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();
- sharedFiles.get(username).clear();
- 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) {
+ private void fetchSharedContainers(final String userID, final ListDataProvider<Folder> dataProvider, final Command callback) {
+ app.LOG("OtherSharedTreeViewModel::fetchSharedContainers(), userID=", userID, ", callback=", callback);
+ GetRequest<AccountResource> getUserSharedContainers = new GetRequest<AccountResource>(AccountResource.class, Pithos.getStorageAPIURL(), userID, "?format=json") {
+
+ @Override
+ public void onSuccess(AccountResource _result) {
+ final ListDataProvider<Folder> tempProvider = new ListDataProvider<Folder>();
+ Iterator<Folder> folderIterator = _result.getContainers().iterator();
+ fetchFolder(userID, folderIterator, tempProvider, new Command() {
+
+ @Override
+ public void execute() {
+ dataProvider.getList().clear();
+ dataProvider.getList().addAll(tempProvider.getList());
+ if(callback != null) {
+ callback.execute();
+ }
+ }
+ });
+ }
+
+ @Override
+ public void onError(Throwable t) {
GWT.log("Error getting account", t);
- app.setError(t);
- if (t instanceof RestException)
+ app.setError(t);
+ if(t instanceof RestException) {
app.displayError("Error getting account: " + ((RestException) t).getHttpStatusText());
- else
+ }
+ else {
app.displayError("System error fetching user data: " + t.getMessage());
- }
+ }
+ }
- @Override
- protected void onUnauthorized(Response response) {
- app.sessionExpired();
- }
- };
- getUserSharedContainers.setHeader("X-Auth-Token", app.getToken());
- Scheduler.get().scheduleDeferred(getUserSharedContainers);
- }
+ @Override
+ protected void onUnauthorized(Response response) {
+ app.sessionExpired();
+ }
+ };
+ getUserSharedContainers.setHeader(Const.X_AUTH_TOKEN, app.getUserToken());
+ Scheduler.get().scheduleDeferred(getUserSharedContainers);
+ }
- protected void fetchFolder(final String username, final Iterator<Folder> iter, final ListDataProvider<Folder> dataProvider, final Command callback) {
- if (iter.hasNext()) {
- final Folder f = iter.next();
+ protected void fetchFolder(final String userID, final Iterator<Folder> folderIterator, final ListDataProvider<Folder> dataProvider, final Command callback) {
+ app.LOG("OtherSharedTreeViewModel::fetchFolder(), userID=", userID, " folderIterator=", folderIterator.hasNext(), ", callback=", callback);
+ if(folderIterator.hasNext()) {
+ final Folder f = folderIterator.next();
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) {
+ GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, Pithos.getStorageAPIURL(), userID, path, f) {
@Override
public void onSuccess(Folder _result) {
- if (!_result.isShared() && !_result.isContainer()) {
- for (File file : _result.getFiles()) {
- if (file.isSharedOrPublished())
- 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(userID, folderIterator, dataProvider, callback);
}
@Override
public void onError(Throwable t) {
GWT.log("Error getting folder", t);
- app.setError(t);
- if (t instanceof RestException)
+ app.setError(t);
+ if(t instanceof RestException) {
app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText());
- else
+ }
+ else {
app.displayError("System error fetching folder: " + t.getMessage());
+ }
}
- @Override
- protected void onUnauthorized(Response response) {
- app.sessionExpired();
- }
+ @Override
+ protected void onUnauthorized(Response response) {
+ app.sessionExpired();
+ }
};
- getFolder.setHeader("X-Auth-Token", app.getToken());
+ getFolder.setHeader(Const.X_AUTH_TOKEN, app.getUserToken());
Scheduler.get().scheduleDeferred(getFolder);
}
- else if (callback != null)
+ else if(callback != null) {
callback.execute();
+ }
}
public Folder getSelection() {
return selectionModel.getSelectedObject();
}
- public void updateFolder(Folder folder, boolean showfiles) {
- if (dataProviderMap.get(folder) == null) {
+ public void updateFolder(Folder folder, boolean showfiles, Command callback) {
+ app.LOG("OtherSharedTreeViewModel::updateFolder(), folder=", folder, ", showfiles=", showfiles, ", callback=", callback);
+ if(dataProviderMap.get(folder) == null) {
dataProviderMap.put(folder, new ListDataProvider<Folder>());
}
final ListDataProvider<Folder> dataProvider = dataProviderMap.get(folder);
- fetchFolder(folder, dataProvider, showfiles);
+ fetchFolder(folder, dataProvider, showfiles, callback);
}
- public void fetchFolder(final Folder f, final ListDataProvider<Folder> dataProvider, final boolean showfiles) {
+ public void fetchFolder(final Folder f, final ListDataProvider<Folder> dataProvider, final boolean showfiles, final Command callback) {
+ app.LOG("OtherSharedTreeViewModel::fetchFolder(), folder=", f, ", showfiles=", showfiles, ", callback=", callback);
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) {
+ GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, Pithos.getStorageAPIURL(), f.getOwnerID(), path, f) {
@Override
public void onSuccess(final Folder _result) {
- if (showfiles)
+ if(showfiles) {
app.showFiles(_result);
+ }
Iterator<Folder> iter = _result.getSubfolders().iterator();
- fetchFolder(_result.getOwner(), iter, dataProvider, new Command() {
+ fetchFolder(_result.getOwnerID(), iter, dataProvider, new Command() {
@Override
public void execute() {
dataProvider.getList().clear();
dataProvider.getList().addAll(_result.getSubfolders());
app.getOtherSharedTreeView().updateChildren(f);
+ if(callback != null) {
+ callback.execute();
+ }
}
});
}
@Override
public void onError(Throwable t) {
GWT.log("Error getting folder", t);
- app.setError(t);
- if (t instanceof RestException)
+ app.setError(t);
+ if(t instanceof RestException) {
app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText());
- else
+ }
+ else {
app.displayError("System error fetching folder: " + t.getMessage());
+ }
}
- @Override
- protected void onUnauthorized(Response response) {
- app.sessionExpired();
- }
+ @Override
+ protected void onUnauthorized(Response response) {
+ app.sessionExpired();
+ }
};
- getFolder.setHeader("X-Auth-Token", app.getToken());
+ getFolder.setHeader(Const.X_AUTH_TOKEN, app.getUserToken());
Scheduler.get().scheduleDeferred(getFolder);
}
-
+
public void initialize(Command callback) {
- fetchSharingUsers(callback);
+ app.LOG("OtherSharedTreeViewModel::initialize(), callback=", callback);
+ fetchSharingUsers(callback);
}
}
projects / pithos-web-client / blobdiff