/*
- * 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.Pithos;
import gr.grnet.pithos.web.client.foldertree.File;
import gr.grnet.pithos.web.client.foldertree.Folder;
+import gr.grnet.pithos.web.client.foldertree.FolderTreeView;
import gr.grnet.pithos.web.client.mysharedtree.MysharedTreeView.Templates;
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.HashSet;
import java.util.Iterator;
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;
private Cell<Folder> folderCell = new AbstractCell<Folder>() {
@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(MysharedTreeView.images.folderYellow()).getHTML();
- safeHtmlBuilder.appendHtmlConstant(html);
+ safeHtmlBuilder.appendHtmlConstant(html).appendHtmlConstant(" ");
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();
MysharedTreeViewModel.this.selectionModel.setSelected(folder, true);
- FolderContextMenu menu = new FolderContextMenu(app, MysharedTreeView.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, MysharedTreeView.images, app.getSelectedTree(), folder);
+ menu.setPopupPosition(x, y);
+ menu.show();
+ }
+ });
}
}
};
public <T> NodeInfo<?> getNodeInfo(T value) {
if (value == null) {
ListDataProvider<String> rootDataProvider = new ListDataProvider<String>();
- rootDataProvider.getList().add("My Shared");
+ rootDataProvider.getList().add("Shared by me");
final SingleSelectionModel<String> selectionModel2 = new SingleSelectionModel<String>();
selectionModel2.addSelectionChangeHandler(new Handler() {
@Override
- public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
+ public void onSelectionChange(SelectionChangeEvent event) {
if (selectionModel2.getSelectedObject() != null) {
app.deselectOthers(app.getMySharedTreeView(), selectionModel2);
app.applyPermissions(null);
- fetchSharedFiles();
+ fetchSharedFiles(true);
+ app.showRelevantToolbarButtons();
}
+ else {
+ if (app.getSelectedTree().equals(app.getMySharedTreeView()) && app.getMySharedTreeView().getSelection() == null)
+ app.setSelectedTree(null);
+ if (app.getSelectedTree() == null)
+ app.showRelevantToolbarButtons();
+ }
}
});
app.addSelectionModel(selectionModel2);
@Override
public void render(String object, SafeHtmlBuilder builder) {
String html = AbstractImagePrototype.create(MysharedTreeView.images.myShared()).getHTML();
- builder.appendHtmlConstant(html);
+ builder.appendHtmlConstant(html).appendHtmlConstant(" ");
builder.append(MysharedTreeView.Templates.INSTANCE.nameSpan(object));
}
}), selectionModel2, null);
}
else if (value instanceof String) {
- fetchSharedContainers();
+ fetchSharedContainers(null);
return new DefaultNodeInfo<Folder>(firstLevelDataProvider, folderCell, selectionModel, null);
}
else {
}
}
- protected void fetchSharedFiles() {
+ protected void fetchSharedFiles(final boolean showFiles) {
+ sharedFiles.clear();
final List<Folder> containers = app.getAccount().getContainers();
final ListDataProvider<Folder> tempProvider = new ListDataProvider<Folder>();
Iterator<Folder> iter = containers.iterator();
public void execute() {
firstLevelDataProvider.getList().clear();
firstLevelDataProvider.getList().addAll(tempProvider.getList());
- app.showFiles(sharedFiles);
+ if (showFiles)
+ app.showFiles(sharedFiles);
}
});
}
- private void fetchSharedContainers() {
+ private void fetchSharedContainers(final Command callback) {
final List<Folder> containers = app.getAccount().getContainers();
final ListDataProvider<Folder> tempProvider = new ListDataProvider<Folder>();
- Iterator<Folder> iter = containers.iterator();
+ Iterator<Folder> iter = containers.listIterator();
fetchFolder(iter, tempProvider, new Command() {
@Override
public void execute() {
firstLevelDataProvider.getList().clear();
firstLevelDataProvider.getList().addAll(tempProvider.getList());
+ if (callback != null)
+ callback.execute();
}
});
}
@Override
public boolean isLeaf(Object o) {
- if (o instanceof Folder) {
+ if (o == null)
+ return false;
+ else if (o instanceof Folder) {
Folder f = (Folder) o;
return f.getSubfolders().isEmpty();
}
- return false;
+ else {
+ return firstLevelDataProvider.getList().isEmpty();
+ }
}
+
+ private native void log(String msg) /*-{
+ $wnd.console.log(msg);
+ }-*/;
protected void fetchFolder(final Iterator<Folder> iter, final ListDataProvider<Folder> dataProvider, final Command callback) {
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(), f.getOwner(), path, f) {
@Override
public void onSuccess(Folder _result) {
if (file.isShared())
sharedFiles.add(file);
}
- Iterator<Folder> iter2 = _result.getSubfolders().iterator();
+ Iterator<Folder> iter2 = new ArrayList<Folder>(result.getSubfolders()).listIterator();
fetchFolder(iter2, dataProvider, new Command() {
@Override
@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 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) {
@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) {
+ fetchSharedContainers(callback);
+ }
}
projects / pithos-web-client / blobdiff