/*
- * 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.PutRequest;
import gr.grnet.pithos.web.client.rest.RestException;
import gr.grnet.pithos.web.client.tagtree.Tag;
-import gr.grnet.pithos.web.client.tagtree.TagTreeView;
-import gr.grnet.pithos.web.client.tagtree.TagTreeViewModel;
import java.util.ArrayList;
import java.util.HashMap;
import com.google.gwt.http.client.RequestCallback;
import com.google.gwt.http.client.RequestException;
import com.google.gwt.http.client.Response;
+import com.google.gwt.http.client.URL;
+import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.json.client.JSONArray;
import com.google.gwt.json.client.JSONObject;
import com.google.gwt.json.client.JSONParser;
import com.google.gwt.json.client.JSONString;
import com.google.gwt.json.client.JSONValue;
import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.ImageResource.ImageOptions;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Cookies;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.HorizontalSplitPanel;
-import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.view.client.SelectionChangeEvent;
groupTreeView.updateGroupNode(group);
}
+ public void updateMySharedRoot() {
+ mysharedTreeView.updateRoot();
+ }
+
public void updateSharedFolder(Folder f, boolean showfiles) {
mysharedTreeView.updateFolder(f, showfiles);
}
otherSharedTreeView.updateFolder(f, showfiles);
}
- public void updateTag(Tag t) {
- tagTreeView.updateTag(t);
- }
-
- public void updateTags() {
- tagTreeViewModel.initialize(getAllTags());
- }
-
public List<Tag> getAllTags() {
List<Tag> tagList = new ArrayList<Tag>();
for (Folder f : account.getContainers()) {
@Source("gr/grnet/pithos/resources/document.png")
ImageResource folders();
- @Source("gr/grnet/pithos/resources/edit_group_22.png")
- ImageResource groups();
-
@Source("gr/grnet/pithos/resources/advancedsettings.png")
+ @ImageOptions(width=32, height=32)
ImageResource tools();
}
+ private Throwable error;
+
/**
* The Application Clipboard implementation;
*/
/**
* The panel that contains the various system messages.
*/
- private MessagePanel messagePanel = new MessagePanel(Pithos.images);
+ private MessagePanel messagePanel = new MessagePanel(this, Pithos.images);
/**
* The bottom panel that contains the status bar.
*/
private Object currentSelection;
-
- /**
- * The WebDAV password of the current user
- */
- private String webDAVPassword;
-
public HashMap<String, String> userFullNameMap = new HashMap<String, String>();
private String username = null;
*/
private String token;
+ VerticalPanel trees;
+
SingleSelectionModel<Folder> folderTreeSelectionModel;
FolderTreeViewModel folderTreeViewModel;
FolderTreeView folderTreeView;
SingleSelectionModel<Folder> mysharedTreeSelectionModel;
- private MysharedTreeViewModel mysharedTreeViewModel;
- MysharedTreeView mysharedTreeView;
+ MysharedTreeViewModel mysharedTreeViewModel;
+ MysharedTreeView mysharedTreeView = null;;
protected SingleSelectionModel<Folder> otherSharedTreeSelectionModel;
- private OtherSharedTreeViewModel otherSharedTreeViewModel;
- OtherSharedTreeView otherSharedTreeView;
-
- protected SingleSelectionModel<Tag> tagTreeSelectionModel;
- private TagTreeViewModel tagTreeViewModel;
- private TagTreeView tagTreeView;
+ OtherSharedTreeViewModel otherSharedTreeViewModel;
+ OtherSharedTreeView otherSharedTreeView = null;
GroupTreeViewModel groupTreeViewModel;
private GroupTreeView groupTreeView;
- private TreeView selectedTree;
+ TreeView selectedTree;
protected AccountResource account;
Folder trash;
+
+ List<Composite> treeViews = new ArrayList<Composite>();
- @SuppressWarnings("rawtypes")
- private List<SingleSelectionModel> selectionModels = new ArrayList<SingleSelectionModel>();
+ @SuppressWarnings("rawtypes") List<SingleSelectionModel> selectionModels = new ArrayList<SingleSelectionModel>();
Button upload;
- private HTML totalFiles;
-
private HTML usedBytes;
private HTML totalBytes;
private HTML usedPercent;
private HTML numOfFiles;
-
+
+ private Toolbar toolbar;
+
@Override
public void onModuleLoad() {
if (parseUserCredentials())
}
private void initialize() {
- VerticalPanel outer = new VerticalPanel();
- outer.setWidth("100%");
+ boolean bareContent = Window.Location.getParameter("noframe") != null;
+ String contentWidth = bareContent ? "100%" : "75%";
- topPanel = new TopPanel(this, Pithos.images);
- topPanel.setWidth("100%");
- outer.add(topPanel);
+ VerticalPanel outer = new VerticalPanel();
+ outer.setWidth("100%");
+ if (!bareContent) {
+ outer.addStyleName("pithos-outer");
+ }
- messagePanel.setWidth("100%");
+ if (!bareContent) {
+ topPanel = new TopPanel(this, Pithos.images);
+ topPanel.setWidth("100%");
+ outer.add(topPanel);
+ outer.setCellHorizontalAlignment(topPanel, HasHorizontalAlignment.ALIGN_CENTER);
+ }
+
messagePanel.setVisible(false);
outer.add(messagePanel);
outer.setCellHorizontalAlignment(messagePanel, HasHorizontalAlignment.ALIGN_CENTER);
+ outer.setCellVerticalAlignment(messagePanel, HasVerticalAlignment.ALIGN_MIDDLE);
-
- // Inner contains the various lists.
- inner.sinkEvents(Event.ONCONTEXTMENU);
- inner.setWidth("100%");
-
- HorizontalPanel rightside = new HorizontalPanel();
- rightside.addStyleName("pithos-rightSide");
- rightside.setSpacing(5);
-
- Image toolsButton = AbstractImagePrototype.create(images.tools()).createImage();
- toolsButton.addClickHandler(new ClickHandler() {
-
- @Override
- public void onClick(ClickEvent event) {
- ToolsMenu menu = new ToolsMenu(Pithos.this, images, getSelectedTree(), getSelectedTree().getSelection(), getFileList().getSelectedFiles());
- menu.setPopupPosition(event.getClientX(), event.getClientY());
- menu.show();
- }
- });
- rightside.add(toolsButton);
- rightside.setCellHorizontalAlignment(toolsButton, HasHorizontalAlignment.ALIGN_LEFT);
+ HorizontalPanel header = new HorizontalPanel();
+ header.addStyleName("pithos-header");
+ header.setWidth(contentWidth);
+ if (bareContent)
+ header.addStyleName("pithos-header-noframe");
+ upload = new Button("Upload File", new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ if (getSelection() != null)
+ new UploadFileCommand(Pithos.this, null, getSelection()).execute();
+ }
+ });
+ upload.addStyleName("pithos-uploadButton");
+ header.add(upload);
+ header.setCellHorizontalAlignment(upload, HasHorizontalAlignment.ALIGN_LEFT);
+ header.setCellVerticalAlignment(upload, HasVerticalAlignment.ALIGN_MIDDLE);
+
+ toolbar = new Toolbar(this);
+ header.add(toolbar);
+ header.setCellHorizontalAlignment(toolbar, HasHorizontalAlignment.ALIGN_CENTER);
+ header.setCellVerticalAlignment(toolbar, HasVerticalAlignment.ALIGN_MIDDLE);
HorizontalPanel folderStatistics = new HorizontalPanel();
folderStatistics.addStyleName("pithos-folderStatistics");
numOfFiles = new HTML();
folderStatistics.add(numOfFiles);
+ folderStatistics.setCellVerticalAlignment(numOfFiles, HasVerticalAlignment.ALIGN_MIDDLE);
HTML numOfFilesLabel = new HTML(" Files");
folderStatistics.add(numOfFilesLabel);
- rightside.add(folderStatistics);
- rightside.setCellHorizontalAlignment(folderStatistics, HasHorizontalAlignment.ALIGN_RIGHT);
-
- inner.add(rightside);
- inner.setCellVerticalAlignment(rightside, HasVerticalAlignment.ALIGN_MIDDLE);
- inner.setCellHeight(rightside, "60px");
+ folderStatistics.setCellVerticalAlignment(numOfFilesLabel, HasVerticalAlignment.ALIGN_MIDDLE);
+ header.add(folderStatistics);
+ header.setCellHorizontalAlignment(folderStatistics, HasHorizontalAlignment.ALIGN_RIGHT);
+ header.setCellVerticalAlignment(folderStatistics, HasVerticalAlignment.ALIGN_MIDDLE);
+ header.setCellWidth(folderStatistics, "40px");
+ outer.add(header);
+ outer.setCellHorizontalAlignment(header, HasHorizontalAlignment.ALIGN_CENTER);
+ // Inner contains the various lists.nner
+ inner.sinkEvents(Event.ONCONTEXTMENU);
+ inner.setWidth("100%");
folderTreeSelectionModel = new SingleSelectionModel<Folder>();
folderTreeSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
@Override
- public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
+ public void onSelectionChange(SelectionChangeEvent event) {
if (folderTreeSelectionModel.getSelectedObject() != null) {
deselectOthers(folderTreeView, folderTreeSelectionModel);
applyPermissions(folderTreeSelectionModel.getSelectedObject());
Folder f = folderTreeSelectionModel.getSelectedObject();
- updateFolder(f, true, null);
+ updateFolder(f, true, new Command() {
+
+ @Override
+ public void execute() {
+ updateStatistics();
+ }
+ });
}
+ showRelevantToolbarButtons();
}
});
selectionModels.add(folderTreeSelectionModel);
folderTreeViewModel = new FolderTreeViewModel(this, folderTreeSelectionModel);
folderTreeView = new FolderTreeView(folderTreeViewModel);
-
+ treeViews.add(folderTreeView);
+
fileList = new FileList(this, images, folderTreeView);
inner.add(fileList);
- mysharedTreeSelectionModel = new SingleSelectionModel<Folder>();
- mysharedTreeSelectionModel.addSelectionChangeHandler(new Handler() {
- @Override
- public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
- if (mysharedTreeSelectionModel.getSelectedObject() != null) {
- deselectOthers(mysharedTreeView, mysharedTreeSelectionModel);
- upload.setEnabled(false);
- updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true);
- }
- }
- });
- selectionModels.add(mysharedTreeSelectionModel);
- mysharedTreeViewModel = new MysharedTreeViewModel(this, mysharedTreeSelectionModel);
- mysharedTreeView = new MysharedTreeView(mysharedTreeViewModel);
-
- otherSharedTreeSelectionModel = new SingleSelectionModel<Folder>();
- otherSharedTreeSelectionModel.addSelectionChangeHandler(new Handler() {
- @Override
- public void onSelectionChange(@SuppressWarnings("unused") SelectionChangeEvent event) {
- if (otherSharedTreeSelectionModel.getSelectedObject() != null) {
- deselectOthers(otherSharedTreeView, otherSharedTreeSelectionModel);
- applyPermissions(otherSharedTreeSelectionModel.getSelectedObject());
- updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true);
- }
- }
- });
- selectionModels.add(otherSharedTreeSelectionModel);
- otherSharedTreeViewModel = new OtherSharedTreeViewModel(this, otherSharedTreeSelectionModel);
- otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel);
-
groupTreeViewModel = new GroupTreeViewModel(this);
groupTreeView = new GroupTreeView(groupTreeViewModel);
+ treeViews.add(groupTreeView);
+
+ trees = new VerticalPanel();
+ trees.setWidth("100%");
- VerticalPanel trees = new VerticalPanel();
-
- upload = new Button("Upload File", new ClickHandler() {
- @Override
- public void onClick(@SuppressWarnings("unused") ClickEvent event) {
- new UploadFileCommand(Pithos.this, null, getSelection()).execute();
- }
- });
- upload.addStyleName("pithos-uploadButton");
- trees.add(upload);
HorizontalPanel treeHeader = new HorizontalPanel();
treeHeader.addStyleName("pithos-treeHeader");
+ treeHeader.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
+ treeHeader.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
HorizontalPanel statistics = new HorizontalPanel();
- statistics.add(new HTML("Total Objects: "));
- totalFiles = new HTML();
- statistics.add(totalFiles);
- statistics.add(new HTML(" | Used: "));
+ statistics.addStyleName("pithos-statistics");
+ statistics.add(new HTML("Used: "));
usedBytes = new HTML();
statistics.add(usedBytes);
statistics.add(new HTML(" of "));
statistics.add(new HTML(" ("));
usedPercent = new HTML();
statistics.add(usedPercent);
- statistics.add(new HTML("%)"));
+ statistics.add(new HTML(")"));
treeHeader.add(statistics);
+ treeHeader.setCellHorizontalAlignment(statistics, HasHorizontalAlignment.ALIGN_LEFT);
trees.add(treeHeader);
trees.add(folderTreeView);
- trees.add(mysharedTreeView);
- trees.add(otherSharedTreeView);
-// trees.add(tagTreeView);
trees.add(groupTreeView);
// Add the left and right panels to the split panel.
splitPanel.setLeftWidget(trees);
splitPanel.setRightWidget(inner);
- splitPanel.setSplitPosition("25%");
+ splitPanel.setSplitPosition("35%");
splitPanel.setSize("100%", "100%");
splitPanel.addStyleName("pithos-splitPanel");
+ splitPanel.setWidth(contentWidth);
outer.add(splitPanel);
+ outer.setCellHorizontalAlignment(splitPanel, HasHorizontalAlignment.ALIGN_CENTER);
- statusPanel = new StatusPanel();
- outer.add(statusPanel);
-
+ if (!bareContent) {
+ statusPanel = new StatusPanel();
+ statusPanel.setWidth("100%");
+ outer.add(statusPanel);
+ outer.setCellHorizontalAlignment(statusPanel, HasHorizontalAlignment.ALIGN_CENTER);
+ }
+ else
+ splitPanel.addStyleName("pithos-splitPanel-noframe");
// Hook the window resize event, so that we can adjust the UI.
Window.addResizeHandler(this);
trash = f;
break;
}
- folderTreeViewModel.initialize(account);
+ folderTreeViewModel.initialize(account, new Command() {
+
+ @Override
+ public void execute() {
+ createMySharedTree();
+ }
+ });
groupTreeViewModel.initialize();
showStatistics();
}
});
}
});
+
+// Scheduler.get().scheduleDeferred(new Command() {
+//
+// @Override
+// public void execute() {
+// displayError("lalala");
+//
+// }
+// });
}
public void applyPermissions(Folder f) {
@SuppressWarnings({ "rawtypes", "unchecked" })
public void deselectOthers(TreeView _selectedTree, SingleSelectionModel model) {
selectedTree = _selectedTree;
+
+ for (Composite c : treeViews)
+ if (c.equals(selectedTree))
+ c.addStyleName("cellTreeWidget-selectedTree");
+ else
+ c.removeStyleName("cellTreeWidget-selectedTree");
+
for (SingleSelectionModel s : selectionModels)
if (!s.equals(model))
s.setSelected(s.getSelectedObject(), false);
}
- public void showFiles(Folder f) {
+ public void showFiles(final Folder f) {
Set<File> files = f.getFiles();
showFiles(files);
}
public void showFiles(Set<File> files) {
- //Iterator<File> iter = files.iterator();
- //fetchFile(iter, files);
fileList.setFiles(new ArrayList<File>(files));
}
String path = file.getUri() + "?format=json";
GetRequest<File> getFile = new GetRequest<File>(File.class, getApiPath(), username, path, file) {
@Override
- public void onSuccess(@SuppressWarnings("unused") File _result) {
+ public void onSuccess(File _result) {
fetchFile(iter, files);
}
@Override
public void onError(Throwable t) {
GWT.log("Error getting file", t);
+ setError(t);
if (t instanceof RestException)
displayError("Error getting file: " + ((RestException) t).getHttpStatusText());
else
displayError("System error fetching file: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
getFile.setHeader("X-Auth-Token", "0000");
Scheduler.get().scheduleDeferred(getFile);
authenticateUser();
return false;
}
+ if (auth.startsWith("\""))
+ auth = auth.substring(1);
+ if (auth.endsWith("\""))
+ auth = auth.substring(0, auth.length() - 1);
String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2);
if (authSplit.length != 2) {
authenticateUser();
token = authSplit[1];
return true;
}
- Cookies.setCookie(conf.authCookie(), username + conf.cookieSeparator() + token);
+
+ Cookies.setCookie(conf.authCookie(), username + conf.cookieSeparator() + token, null, "", "/", false);
return true;
}
* Redirect the user to the login page for authentication.
*/
protected void authenticateUser() {
- Configuration conf = (Configuration) GWT.create(Configuration.class);
- Window.Location.assign(conf.loginUrl() + "?next=" + Window.Location.getHref());
+ Window.Location.assign("/im/login");
}
protected void fetchAccount(final Command callback) {
@Override
public void onError(Throwable t) {
GWT.log("Error getting account", t);
+ setError(t);
if (t instanceof RestException)
displayError("Error getting account: " + ((RestException) t).getHttpStatusText());
else
displayError("System error fetching user data: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
getAccount.setHeader("X-Auth-Token", token);
Scheduler.get().scheduleDeferred(getAccount);
HeadRequest<AccountResource> headAccount = new HeadRequest<AccountResource>(AccountResource.class, getApiPath(), username, "", account) {
@Override
- public void onSuccess(@SuppressWarnings("unused") AccountResource _result) {
+ public void onSuccess(AccountResource _result) {
showStatistics();
}
@Override
public void onError(Throwable t) {
GWT.log("Error getting account", t);
+ setError(t);
if (t instanceof RestException)
displayError("Error getting account: " + ((RestException) t).getHttpStatusText());
else
displayError("System error fetching user data: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
headAccount.setHeader("X-Auth-Token", token);
Scheduler.get().scheduleDeferred(headAccount);
}
protected void showStatistics() {
- totalFiles.setHTML(String.valueOf(account.getNumberOfObjects()));
usedBytes.setHTML(String.valueOf(account.getFileSizeAsString()));
totalBytes.setHTML(String.valueOf(account.getQuotaAsString()));
- usedPercent.setHTML(String.valueOf(account.getUsedPercentage()));
+ NumberFormat nf = NumberFormat.getPercentFormat();
+ usedPercent.setHTML(nf.format(account.getUsedPercentage()));
}
protected void createHomeContainer(final AccountResource _account, final Command callback) {
String path = "/" + Pithos.HOME_CONTAINER;
PutRequest createPithos = new PutRequest(getApiPath(), getUsername(), path) {
@Override
- public void onSuccess(@SuppressWarnings("unused") Resource result) {
+ public void onSuccess(Resource result) {
if (!_account.hasTrashContainer())
createTrashContainer(callback);
else
@Override
public void onError(Throwable t) {
GWT.log("Error creating pithos", t);
+ setError(t);
if (t instanceof RestException)
displayError("Error creating pithos: " + ((RestException) t).getHttpStatusText());
else
displayError("System error Error creating pithos: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
createPithos.setHeader("X-Auth-Token", getToken());
Scheduler.get().scheduleDeferred(createPithos);
String path = "/" + Pithos.TRASH_CONTAINER;
PutRequest createPithos = new PutRequest(getApiPath(), getUsername(), path) {
@Override
- public void onSuccess(@SuppressWarnings("unused") Resource result) {
+ public void onSuccess(Resource result) {
fetchAccount(callback);
}
@Override
public void onError(Throwable t) {
GWT.log("Error creating pithos", t);
+ setError(t);
if (t instanceof RestException)
displayError("Error creating pithos: " + ((RestException) t).getHttpStatusText());
else
displayError("System error Error creating pithos: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
createPithos.setHeader("X-Auth-Token", getToken());
Scheduler.get().scheduleDeferred(createPithos);
protected void onWindowResized(int height) {
// Adjust the split panel to take up the available room in the window.
- int newHeight = height - splitPanel.getAbsoluteTop() - 60;
+ int newHeight = height - splitPanel.getAbsoluteTop();
if (newHeight < 1)
newHeight = 1;
splitPanel.setHeight("" + newHeight);
return token;
}
- public String getWebDAVPassword() {
- return webDAVPassword;
- }
-
public static native void preventIESelection() /*-{
$doc.body.onselectstart = function () { return false; };
}-*/;
}
public void deleteFolder(final Folder folder) {
- String path = getApiPath() + folder.getOwner() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + folder.getPrefix();
+ String path = getApiPath() + folder.getOwner() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(folder.getPrefix()) + "&t=" + System.currentTimeMillis();
RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path);
- builder.setHeader("If-Modified-Since", "0");
builder.setHeader("X-Auth-Token", getToken());
try {
builder.sendRequest("", new RequestCallback() {
@Override
- public void onResponseReceived(@SuppressWarnings("unused") Request request, Response response) {
+ public void onResponseReceived(Request request, Response response) {
if (response.getStatusCode() == Response.SC_OK) {
JSONValue json = JSONParser.parseStrict(response.getText());
JSONArray array = json.isArray();
}
@Override
- public void onError(@SuppressWarnings("unused") Request request, Throwable exception) {
+ public void onError(Request request, Throwable exception) {
+ setError(exception);
displayError("System error unable to delete folder: " + exception.getMessage());
}
});
if (o != null && !o.containsKey("subdir")) {
JSONString name = o.get("name").isString();
String path = "/" + folder.getContainer() + "/" + name.stringValue();
- DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), path) {
+ DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), URL.encode(path)) {
@Override
- public void onSuccess(@SuppressWarnings("unused") Resource result) {
+ public void onSuccess(Resource result) {
deleteObject(folder, i + 1, array);
}
@Override
public void onError(Throwable t) {
GWT.log("", t);
+ setError(t);
displayError("System error unable to delete folder: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
delete.setHeader("X-Auth-Token", getToken());
Scheduler.get().scheduleDeferred(delete);
else if (o != null) {
String subdir = o.get("subdir").isString().stringValue();
subdir = subdir.substring(0, subdir.length() - 1);
- String path = getApiPath() + getUsername() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + subdir;
+ String path = getApiPath() + getUsername() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(subdir) + "&t=" + System.currentTimeMillis();
RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, path);
- builder.setHeader("If-Modified-Since", "0");
builder.setHeader("X-Auth-Token", getToken());
try {
builder.sendRequest("", new RequestCallback() {
@Override
- public void onResponseReceived(@SuppressWarnings("unused") Request request, Response response) {
+ public void onResponseReceived(Request request, Response response) {
if (response.getStatusCode() == Response.SC_OK) {
JSONValue json = JSONParser.parseStrict(response.getText());
JSONArray array2 = json.isArray();
}
@Override
- public void onError(@SuppressWarnings("unused") Request request, Throwable exception) {
+ public void onError(Request request, Throwable exception) {
+ setError(exception);
displayError("System error unable to delete folder: " + exception.getMessage());
}
});
}
else {
String path = folder.getUri();
- DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), path) {
+ DeleteRequest deleteFolder = new DeleteRequest(getApiPath(), getUsername(), URL.encode(path)) {
@Override
- public void onSuccess(@SuppressWarnings("unused") Resource result) {
+ public void onSuccess(Resource result) {
updateFolder(folder.getParent(), true, new Command() {
@Override
@Override
public void onError(Throwable t) {
GWT.log("", t);
+ setError(t);
if (t instanceof RestException) {
if (((RestException) t).getHttpStatusCode() != Response.SC_NOT_FOUND)
displayError("Unable to delete folder: "+((RestException) t).getHttpStatusText());
else
displayError("System error unable to delete folder: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
deleteFolder.setHeader("X-Auth-Token", getToken());
Scheduler.get().scheduleDeferred(deleteFolder);
String path = targetUri + "/" + file.getName();
PutRequest copyFile = new PutRequest(getApiPath(), targetUsername, path) {
@Override
- public void onSuccess(@SuppressWarnings("unused") Resource result) {
+ public void onSuccess(Resource result) {
copyFiles(iter, targetUsername, targetUri, callback);
}
@Override
public void onError(Throwable t) {
GWT.log("", t);
+ setError(t);
if (t instanceof RestException) {
displayError("Unable to copy file: " + ((RestException) t).getHttpStatusText());
}
else
displayError("System error unable to copy file: "+t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
copyFile.setHeader("X-Auth-Token", getToken());
- copyFile.setHeader("X-Copy-From", file.getUri());
+ copyFile.setHeader("X-Copy-From", URL.encodePathSegment(file.getUri()));
+ if (!file.getOwner().equals(targetUsername))
+ copyFile.setHeader("X-Source-Account", URL.encodePathSegment(file.getOwner()));
+ copyFile.setHeader("Content-Type", file.getContentType());
Scheduler.get().scheduleDeferred(copyFile);
}
else if (callback != null) {
String path = targetUri + "/" + f.getName();
PutRequest createFolder = new PutRequest(getApiPath(), targetUsername, path) {
@Override
- public void onSuccess(@SuppressWarnings("unused") Resource result) {
- GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, getApiPath(), f.getOwner(), "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + f.getPrefix(), f) {
+ public void onSuccess(Resource result) {
+ GetRequest<Folder> getFolder = new GetRequest<Folder>(Folder.class, getApiPath(), f.getOwner(), "/" + f.getContainer() + "?format=json&delimiter=/&prefix=" + URL.encodeQueryString(f.getPrefix()), f) {
@Override
public void onSuccess(final Folder _f) {
@Override
public void onError(Throwable t) {
GWT.log("", t);
+ setError(t);
if (t instanceof RestException) {
displayError("Unable to get folder: " + ((RestException) t).getHttpStatusText());
}
else
displayError("System error getting folder: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
getFolder.setHeader("X-Auth-Token", getToken());
Scheduler.get().scheduleDeferred(getFolder);
@Override
public void onError(Throwable t) {
GWT.log("", t);
- if (t instanceof RestException) {
+ setError(t);
+ if (t instanceof RestException) {
displayError("Unable to create folder: " + ((RestException) t).getHttpStatusText());
}
else
displayError("System error creating folder: " + t.getMessage());
}
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
};
createFolder.setHeader("X-Auth-Token", getToken());
createFolder.setHeader("Accept", "*/*");
public void showFolderStatistics(int folderFileCount) {
numOfFiles.setHTML(String.valueOf(folderFileCount));
}
+
+ public GroupTreeView getGroupTreeView() {
+ return groupTreeView;
+ }
+
+ public void sessionExpired() {
+ new SessionExpiredDialog(this).center();
+ }
+
+ public void updateRootFolder(Command callback) {
+ updateFolder(account.getPithos(), false, callback);
+ }
+
+ void createMySharedTree() {
+ mysharedTreeSelectionModel = new SingleSelectionModel<Folder>();
+ mysharedTreeSelectionModel.addSelectionChangeHandler(new Handler() {
+ @Override
+ public void onSelectionChange(SelectionChangeEvent event) {
+ if (mysharedTreeSelectionModel.getSelectedObject() != null) {
+ deselectOthers(mysharedTreeView, mysharedTreeSelectionModel);
+ upload.setEnabled(false);
+ updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true);
+ }
+ showRelevantToolbarButtons();
+ }
+ });
+ selectionModels.add(mysharedTreeSelectionModel);
+ mysharedTreeViewModel = new MysharedTreeViewModel(Pithos.this, mysharedTreeSelectionModel);
+ mysharedTreeViewModel.initialize(new Command() {
+
+ @Override
+ public void execute() {
+ mysharedTreeView = new MysharedTreeView(mysharedTreeViewModel);
+ trees.insert(mysharedTreeView, 2);
+ treeViews.add(mysharedTreeView);
+ createOtherSharedTree();
+ }
+ });
+ }
+
+ void createOtherSharedTree() {
+ otherSharedTreeSelectionModel = new SingleSelectionModel<Folder>();
+ otherSharedTreeSelectionModel.addSelectionChangeHandler(new Handler() {
+ @Override
+ public void onSelectionChange(SelectionChangeEvent event) {
+ if (otherSharedTreeSelectionModel.getSelectedObject() != null) {
+ deselectOthers(otherSharedTreeView, otherSharedTreeSelectionModel);
+ otherSharedTreeView.addStyleName("cellTreeWidget-selectedTree");
+ applyPermissions(otherSharedTreeSelectionModel.getSelectedObject());
+ updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true);
+ }
+ showRelevantToolbarButtons();
+ }
+ });
+ selectionModels.add(otherSharedTreeSelectionModel);
+ otherSharedTreeViewModel = new OtherSharedTreeViewModel(Pithos.this, otherSharedTreeSelectionModel);
+ otherSharedTreeViewModel.initialize(new Command() {
+
+ @Override
+ public void execute() {
+ otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel);
+ trees.insert(otherSharedTreeView, 3);
+ treeViews.add(otherSharedTreeView);
+ }
+ });
+ }
+
+ public void logoff() {
+ Configuration conf = (Configuration) GWT.create(Configuration.class);
+ Cookies.removeCookie(conf.authCookie(), "/");
+ Cookies.removeCookie(conf.authTokenCookie(), "/");
+ for (String s: Cookies.getCookieNames())
+ if (s.startsWith(conf.shibSessionCookiePrefix()))
+ Cookies.removeCookie(s, "/");
+ Window.Location.assign("/im/logout");
+ }
+
+ public String getErrorData() {
+ if (error != null)
+ return error.toString();
+ return "";
+ }
+
+ public void setError(Throwable t) {
+ error = t;
+ }
+
+ public void showRelevantToolbarButtons() {
+ toolbar.showRelevantButtons();
+ }
}
projects / pithos-web-client / blobdiff