/*
- * 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
import gr.grnet.pithos.web.client.rest.GetRequest;
import gr.grnet.pithos.web.client.rest.RestException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import com.google.gwt.cell.client.Cell;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
-import com.google.gwt.core.client.Scheduler.ScheduledCommand;
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.user.client.Command;
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()) {
html = AbstractImagePrototype.create(FolderTreeView.images.home()).getHTML();
- name = Templates.INSTANCE.nameSpan("Home");
+ name = Templates.INSTANCE.nameSpan("Pithos");
}
else if (folder.isTrash()) {
html = AbstractImagePrototype.create(FolderTreeView.images.trash()).getHTML();
name = Templates.INSTANCE.nameSpan("Trash");
}
else {
- html = AbstractImagePrototype.create(FolderTreeView.images.folderYellow()).getHTML();
+ html = AbstractImagePrototype.create(folder.isShared() ? FolderTreeView.images.myShared() : FolderTreeView.images.folderYellow()).getHTML();
name = Templates.INSTANCE.nameSpan(folder.getName());
}
- safeHtmlBuilder.appendHtmlConstant(html);
+ safeHtmlBuilder.appendHtmlConstant(html).appendHtmlConstant(" ");
safeHtmlBuilder.append(name);
}
@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);
- if (!folder.isTrash()) {
- FolderContextMenu menu = new FolderContextMenu(app, FolderTreeView.images, 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();
+ }
+ });
}
}
};
dataProviderMap.put(f, new ListDataProvider<Folder>());
}
final ListDataProvider<Folder> dataProvider = dataProviderMap.get(f);
- fetchFolder(f, dataProvider, false);
+ //This prevents the loading indicator
+// dataProvider.getList().clear();
+// dataProvider.getList().addAll(f.getSubfolders());
+ fetchFolder(f, dataProvider, false, null);
return new DefaultNodeInfo<Folder>(dataProvider, folderCell, selectionModel, null);
}
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();
- String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix();
- GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, app.getApiPath(), app.getUsername(), path, f) {
+ 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);
}
@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);
callback.execute();
}
- public void initialize(final AccountResource account) {
- Iterator<Folder> iter = account.getContainers().iterator();
+ public void initialize(final AccountResource account, final Command callback) {
+ Iterator<Folder> iter = account.getContainers().listIterator();
fetchFolder(iter, new Command() {
@Override
public void execute() {
rootDataProvider.getList().clear();
- rootDataProvider.getList().addAll(account.getContainers());
+ Folder t = null;
+ for (Folder c : account.getContainers()) {
+ if (c.isHome())
+ rootDataProvider.getList().add(0, c); //Pithos is always first
+ else if (c.isTrash())
+ t = c; //Keep trash for adding in the end
+ else
+ rootDataProvider.getList().add(c);
+ }
+ if (t != null)
+ rootDataProvider.getList().add(t);
selectionModel.setSelected(rootDataProvider.getList().get(0), true);
+ if (callback != null)
+ callback.execute();
}
});
}
return selectionModel.getSelectedObject();
}
- public void updateFolder(Folder folder, boolean showfiles) {
+ public void updateFolder(final Folder folder, boolean showfiles, final Command callback) {
if (dataProviderMap.get(folder) == null) {
dataProviderMap.put(folder, new ListDataProvider<Folder>());
}
final ListDataProvider<Folder> dataProvider = dataProviderMap.get(folder);
- if (!folder.isTrash())
- fetchFolder(folder, dataProvider, showfiles);
- else
- app.showFiles(folder);
+ fetchFolder(folder, dataProvider, showfiles, new Command() {
+
+ @Override
+ public void execute() {
+ app.getFolderTreeView().openFolder(folder);
+ if (callback != null)
+ callback.execute();
+ }
+ });
}
- public void fetchFolder(final Folder f, final ListDataProvider<Folder> dataProvider, final boolean showfiles) {
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+ public void fetchFolder(final Folder f, final ListDataProvider<Folder> dataProvider, final boolean showfiles, final Command 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) {
@Override
- public void execute() {
- String path = "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix();
- GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, app.getApiPath(), app.getUsername(), path, f) {
+ public void onSuccess(final Folder _result) {
+ if (showfiles)
+ app.showFiles(_result);
+ Iterator<Folder> iter = new ArrayList<Folder>(_result.getSubfolders()).listIterator();
+ fetchFolder(iter, new Command() {
@Override
- public void onSuccess(final Folder _result) {
- if (showfiles)
- app.showFiles(_result);
- Iterator<Folder> iter = _result.getSubfolders().iterator();
- fetchFolder(iter, new Command() {
- @Override
- public void execute() {
- dataProvider.getList().clear();
- dataProvider.getList().addAll(_result.getSubfolders());
- app.getFolderTreeView().updateChildren(f);
- }
- });
+ public void execute() {
+ dataProvider.getList().clear();
+ dataProvider.getList().addAll(_result.getSubfolders());
+// app.getFolderTreeView().updateChildren(f);
+ if (callback != null)
+ callback.execute();
}
+ });
+ }
- @Override
- public void onError(Throwable t) {
- GWT.log("Error getting folder", t);
- if (t instanceof RestException)
- app.displayError("Error getting folder: " + ((RestException) t).getHttpStatusText());
- else
- app.displayError("System error fetching folder: " + t.getMessage());
- }
- };
- getFolder.setHeader("X-Auth-Token", app.getToken());
- Scheduler.get().scheduleDeferred(getFolder);
+ @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);
}
}
projects / pithos-web-client / blobdiff