/*
- * 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.grouptree.Group;
import gr.grnet.pithos.web.client.grouptree.GroupTreeView;
import gr.grnet.pithos.web.client.grouptree.GroupTreeViewModel;
-import gr.grnet.pithos.web.client.grouptree.User;
import gr.grnet.pithos.web.client.mysharedtree.MysharedTreeView;
import gr.grnet.pithos.web.client.mysharedtree.MysharedTreeViewModel;
import gr.grnet.pithos.web.client.othersharedtree.OtherSharedTreeView;
import gr.grnet.pithos.web.client.rest.HeadRequest;
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.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.JsArrayString;
import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.RepeatingCommand;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
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.Dictionary;
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.ClientBundle;
+import com.google.gwt.resources.client.CssResource;
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.FlowPanel;
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.PushButton;
+import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.view.client.SelectionChangeEvent;
public static final String HOME_CONTAINER = "pithos";
public static final String TRASH_CONTAINER = "trash";
+
+ public static final Configuration config = GWT.create(Configuration.class);
+
+ public interface Style extends CssResource {
+ String commandAnchor();
+
+ String statistics();
+
+ @ClassName("gwt-HTML")
+ String html();
+
+ String uploadAlert();
+
+ String uploadAlertLink();
+
+ String uploadAlertProgress();
+
+ String uploadAlertPercent();
+
+ String uploadAlertClose();
+ }
+
+ public interface Resources extends ClientBundle {
+ @Source("Pithos.css")
+ Style pithosCss();
+
+ @Source("gr/grnet/pithos/resources/close-popup.png")
+ ImageResource closePopup();
+ }
+
+ public static Resources resources = GWT.create(Resources.class);
/**
* Instantiate an application-level image bundle. This object will provide
* programmatic access to all the images needed by widgets.
*/
- private static Images images = (Images) GWT.create(Images.class);
+ static Images images = (Images) GWT.create(Images.class);
public String getUsername() {
return username;
return account;
}
- public void updateFolder(Folder f, boolean showfiles, Command callback) {
- folderTreeView.updateFolder(f, showfiles, callback);
+ public void updateFolder(Folder f, boolean showfiles, Command callback, final boolean openParent) {
+ folderTreeView.updateFolder(f, showfiles, callback, openParent);
}
public void updateGroupNode(Group group) {
groupTreeView.updateGroupNode(group);
}
- public void updateSharedFolder(Folder f, boolean showfiles) {
- mysharedTreeView.updateFolder(f, showfiles);
+ public void updateMySharedRoot() {
+ mysharedTreeView.updateRoot();
}
- public void updateOtherSharedFolder(Folder f, boolean showfiles) {
- otherSharedTreeView.updateFolder(f, showfiles);
+ public void updateSharedFolder(Folder f, boolean showfiles, Command callback) {
+ mysharedTreeView.updateFolder(f, showfiles, callback);
}
-
- public void updateTag(Tag t) {
- tagTreeView.updateTag(t);
- }
-
- public void updateTags() {
- tagTreeViewModel.initialize(getAllTags());
+
+ public void updateSharedFolder(Folder f, boolean showfiles) {
+ updateSharedFolder(f, showfiles, null);
}
- public List<Tag> getAllTags() {
- List<Tag> tagList = new ArrayList<Tag>();
- for (Folder f : account.getContainers()) {
- for (String t : f.getTags()) {
- tagList.add(new Tag(t));
- }
- }
- return tagList;
+ public void updateOtherSharedFolder(Folder f, boolean showfiles, Command callback) {
+ otherSharedTreeView.updateFolder(f, showfiles, callback);
}
public MysharedTreeView getMySharedTreeView() {
* An aggregate image bundle that pulls together all the images for this
* application into a single bundle.
*/
- public interface Images extends TopPanel.Images, FileList.Images {
+ public interface Images extends TopPanel.Images, FileList.Images, ToolsMenu.Images {
@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/search.png")
- ImageResource search();
+ @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 StatusPanel statusPanel = null;
+ StatusPanel statusPanel = null;
/**
* The file list widget.
*/
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;
+ OtherSharedTreeViewModel otherSharedTreeViewModel;
+ OtherSharedTreeView otherSharedTreeView = null;
- protected SingleSelectionModel<Tag> tagTreeSelectionModel;
- private TagTreeViewModel tagTreeViewModel;
- private TagTreeView tagTreeView;
+ GroupTreeViewModel groupTreeViewModel;
+ GroupTreeView groupTreeView;
- private GroupTreeViewModel groupTreeViewModel;
- private GroupTreeView groupTreeView;
-
- private TreeView selectedTree;
+ TreeView selectedTree;
protected AccountResource account;
- private Folder trash;
-
- @SuppressWarnings("rawtypes")
- private List<SingleSelectionModel> selectionModels = new ArrayList<SingleSelectionModel>();
+ Folder trash;
- Button upload;
+ List<Composite> treeViews = new ArrayList<Composite>();
+
+ @SuppressWarnings("rawtypes") List<SingleSelectionModel> selectionModels = new ArrayList<SingleSelectionModel>();
- private HTML totalFiles;
+ public Button upload;
- private HTML usedBytes;
+ private HTML numOfFiles;
- private HTML totalBytes;
+ private Toolbar toolbar;
- private HTML usedPercent;
+ private FileUploadDialog fileUploadDialog = new FileUploadDialog(this);
+
+ UploadAlert uploadAlert;
@Override
public void onModuleLoad() {
}
private void initialize() {
- VerticalPanel outer = new VerticalPanel();
- outer.setWidth("100%");
+ resources.pithosCss().ensureInjected();
+ 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);
-
-
- // Inner contains the various lists.
+ outer.setCellVerticalAlignment(messagePanel, HasVerticalAlignment.ALIGN_MIDDLE);
+
+ HorizontalPanel header = new HorizontalPanel();
+ header.addStyleName("pithos-header");
+ header.setWidth(contentWidth);
+ if (bareContent)
+ header.addStyleName("pithos-header-noframe");
+ upload = new Button("Upload", 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);
+ 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
inner.sinkEvents(Event.ONCONTEXTMENU);
inner.setWidth("100%");
- HorizontalPanel rightside = new HorizontalPanel();
- rightside.addStyleName("pithos-rightSide");
- rightside.setSpacing(5);
-
- HTML folderStatistics = new HTML("5 Files (size: 1.1GB)");
- folderStatistics.addStyleName("pithos-folderStatistics");
- rightside.add(folderStatistics);
- inner.add(rightside);
- inner.setCellHorizontalAlignment(rightside, HasHorizontalAlignment.ALIGN_RIGHT);
- inner.setCellVerticalAlignment(rightside, HasVerticalAlignment.ALIGN_MIDDLE);
- inner.setCellHeight(rightside, "60px");
-
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();
+ }
+ }, true);
+ showRelevantToolbarButtons();
}
+ else {
+ if (getSelectedTree().equals(folderTreeView))
+ setSelectedTree(null);
+ if (getSelectedTree() == null)
+ showRelevantToolbarButtons();
+ }
}
});
selectionModels.add(folderTreeSelectionModel);
folderTreeViewModel = new FolderTreeViewModel(this, folderTreeSelectionModel);
folderTreeView = new FolderTreeView(folderTreeViewModel);
-
- fileList = new FileList(this, images, folderTreeView);
+ treeViews.add(folderTreeView);
+
+ fileList = new FileList(this, images);
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);
-
- 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);
+ trees = new VerticalPanel();
+ trees.setWidth("100%");
- HorizontalPanel treeHeader = new HorizontalPanel();
- treeHeader.addStyleName("pithos-treeHeader");
- HorizontalPanel statistics = new HorizontalPanel();
- statistics.add(new HTML("Total Objects: "));
- totalFiles = new HTML();
- statistics.add(totalFiles);
- statistics.add(new HTML(" | Used: "));
- usedBytes = new HTML();
- statistics.add(usedBytes);
- statistics.add(new HTML(" of "));
- totalBytes = new HTML();
- statistics.add(totalBytes);
- statistics.add(new HTML(" ("));
- usedPercent = new HTML();
- statistics.add(usedPercent);
- statistics.add(new HTML("%)"));
- treeHeader.add(statistics);
- 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%");
+ FlowPanel right = new FlowPanel();
+ right.getElement().setId("rightPanel");
+ right.add(inner);
+ splitPanel.setRightWidget(right);
+ splitPanel.setSplitPosition("219px");
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);
// Call the window resized handler to get the initial sizes setup. Doing
// this in a deferred command causes it to occur after all widgets'
// sizes have been computed by the browser.
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
-
- @Override
- public void execute() {
+ Scheduler.get().scheduleIncremental(new RepeatingCommand() {
+
+ @Override
+ public boolean execute() {
+ if (!isCloudbarReady())
+ return true;
onWindowResized(Window.getClientHeight());
- }
- });
-
+ return false;
+ }
+ });
+
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@Override
public void execute() {
trash = f;
break;
}
- folderTreeViewModel.initialize(account);
- groupTreeViewModel.initialize();
- showStatistics();
+ trees.add(folderTreeView);
+ folderTreeViewModel.initialize(account, new Command() {
+
+ @Override
+ public void execute() {
+ createMySharedTree();
+ }
+ });
+
+ HorizontalPanel separator = new HorizontalPanel();
+ separator.addStyleName("pithos-statisticsSeparator");
+ separator.add(new HTML(""));
+ trees.add(separator);
+
+ groupTreeViewModel = new GroupTreeViewModel(Pithos.this);
+ groupTreeView = new GroupTreeView(groupTreeViewModel);
+ treeViews.add(groupTreeView);
+ trees.add(groupTreeView);
+ folderTreeView.showStatistics(account);
}
}
});
}
});
+
+ Scheduler.get().scheduleFixedDelay(new RepeatingCommand() {
+
+ @Override
+ public boolean execute() {
+ Folder f = getSelection();
+ if (f != null) {
+ if (getSelectedTree().equals(folderTreeView))
+ updateFolder(f, true, null, false);
+ else if (getSelectedTree().equals(mysharedTreeView))
+ updateSharedFolder(f, true);
+ }
+ return true;
+ }
+ }, 3000);
}
public void applyPermissions(Folder f) {
if (f != null) {
- if (f.isInTrash())
+ if (f.isInTrash()) {
upload.setEnabled(false);
+ disableUploadArea();
+ }
else {
Boolean[] perms = f.getPermissions().get(username);
if (f.getOwner().equals(username) || (perms != null && perms[1] != null && perms[1])) {
upload.setEnabled(true);
+ enableUploadArea();
}
- else
+ else {
upload.setEnabled(false);
+ disableUploadArea();
+ }
}
}
- else
+ else {
upload.setEnabled(false);
+ disableUploadArea();
+ }
}
@SuppressWarnings({ "rawtypes", "unchecked" })
public void deselectOthers(TreeView _selectedTree, SingleSelectionModel model) {
selectedTree = _selectedTree;
+
for (SingleSelectionModel s : selectionModels)
- if (!s.equals(model))
+ if (!s.equals(model) && s.getSelectedObject() != null)
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));
}
- protected void fetchFile(final Iterator<File> iter, final Set<File> files) {
- if (iter.hasNext()) {
- File file = iter.next();
- 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) {
- fetchFile(iter, files);
- }
-
- @Override
- public void onError(Throwable t) {
- GWT.log("Error getting file", t);
- if (t instanceof RestException)
- displayError("Error getting file: " + ((RestException) t).getHttpStatusText());
- else
- displayError("System error fetching file: " + t.getMessage());
- }
- };
- getFile.setHeader("X-Auth-Token", "0000");
- Scheduler.get().scheduleDeferred(getFile);
- }
- else
- fileList.setFiles(new ArrayList<File>(files));
- }
-
/**
* Parse and store the user credentials to the appropriate fields.
*/
private boolean parseUserCredentials() {
- username = Window.Location.getParameter("user");
- token = Window.Location.getParameter("token");
Configuration conf = (Configuration) GWT.create(Configuration.class);
- if (username == null || username.length() == 0 || token == null || token.length() == 0) {
- String cookie = conf.authCookie();
- String auth = Cookies.getCookie(cookie);
- if (auth == null) {
- authenticateUser();
- return false;
- }
- String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2);
- if (authSplit.length != 2) {
- authenticateUser();
- return false;
- }
- username = authSplit[0];
- token = authSplit[1];
- return true;
+ Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
+ String cookie = otherProperties.get("authCookie");
+ String auth = Cookies.getCookie(cookie);
+ if (auth == null) {
+ authenticateUser();
+ return false;
}
- Cookies.setCookie(conf.authCookie(), username + conf.cookieSeparator() + token);
+ 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();
+ return false;
+ }
+ username = authSplit[0];
+ token = authSplit[1];
+
+ String gotoUrl = Window.Location.getParameter("goto");
+ if (gotoUrl != null && gotoUrl.length() > 0) {
+ Window.Location.assign(gotoUrl);
+ return 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());
+ Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
+ Window.Location.assign(otherProperties.get("loginUrl") + Window.Location.getHref());
}
- protected void fetchAccount(final Command callback) {
+ public void fetchAccount(final Command callback) {
String path = "?format=json";
GetRequest<AccountResource> getAccount = new GetRequest<AccountResource>(AccountResource.class, getApiPath(), username, path) {
@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);
@Override
public void onSuccess(AccountResource _result) {
- showStatistics();
+ folderTreeView.showStatistics(account);
}
@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()));
- }
-
- protected void createHomeContainer(final AccountResource account, final Command callback) {
+ 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) {
- if (!account.hasTrashContainer())
+ public void onSuccess(Resource result) {
+ if (!_account.hasTrashContainer())
createTrashContainer(callback);
else
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);
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() - 153;
if (newHeight < 1)
newHeight = 1;
splitPanel.setHeight("" + newHeight);
inner.setHeight("" + newHeight);
}
-
+
+ native boolean isCloudbarReady()/*-{
+ if ($wnd.$("div.servicesbar") && $wnd.$("div.servicesbar").height() > 0)
+ return true;
+ return false;
+ }-*/;
+
@Override
public void onResize(ResizeEvent event) {
int height = event.getHeight();
*/
public void displayError(String msg) {
messagePanel.displayError(msg);
+ onWindowResized(Window.getClientHeight());
}
/**
*/
public void displayWarning(String msg) {
messagePanel.displayWarning(msg);
+ onWindowResized(Window.getClientHeight());
}
/**
*/
public void displayInformation(String msg) {
messagePanel.displayInformation(msg);
+ onWindowResized(Window.getClientHeight());
}
/**
return token;
}
- public String getWebDAVPassword() {
- return webDAVPassword;
- }
-
public static native void preventIESelection() /*-{
$doc.body.onselectstart = function () { return false; };
}-*/;
History.newItem(key);
}
- public void deleteFolder(final Folder folder) {
- String path = getApiPath() + folder.getOwner() + "/" + folder.getContainer() + "?format=json&delimiter=/&prefix=" + folder.getPrefix();
+ public void deleteFolder(final Folder folder, final Command callback) {
+ 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();
int i = 0;
if (array != null) {
- deleteObject(folder, i, array);
+ deleteObject(folder, i, array, callback);
}
}
}
@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());
}
});
}
}
- void deleteObject(final Folder folder, final int i, final JSONArray array) {
+ void deleteObject(final Folder folder, final int i, final JSONArray array, final Command callback) {
if (i < array.size()) {
JSONObject o = array.get(i).isObject();
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) {
- deleteObject(folder, i + 1, array);
+ public void onSuccess(Resource result) {
+ deleteObject(folder, i + 1, array, callback);
}
@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();
array.set(l++, array2.get(j));
}
}
- deleteObject(folder, i + 1, array);
+ deleteObject(folder, i + 1, array, callback);
}
}
@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
public void execute() {
+ folderTreeSelectionModel.setSelected(folder.getParent(), true);
updateStatistics();
+ if (callback != null)
+ callback.execute();
}
- });
+ }, true);
}
@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) {
- Iterator<File> iter = f.getFiles().iterator();
- copyFiles(iter, targetUsername, targetUri + "/" + f.getName(), new Command() {
+ public void onSuccess(final Folder _f) {
+ Iterator<File> iter = _f.getFiles().iterator();
+ copyFiles(iter, targetUsername, targetUri + "/" + _f.getName(), new Command() {
@Override
public void execute() {
- Iterator<Folder> iterf = f.getSubfolders().iterator();
- copySubfolders(iterf, targetUsername, targetUri + "/" + f.getName(), callback);
+ Iterator<Folder> iterf = _f.getSubfolders().iterator();
+ copySubfolders(iterf, targetUsername, targetUri + "/" + _f.getName(), callback);
}
});
}
@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 updateTrash(boolean showFiles, Command callback) {
- updateFolder(trash, showFiles, callback);
+ updateFolder(trash, showFiles, callback, true);
}
public void updateGroupsNode() {
groupTreeView.updateGroupNode(null);
}
- public void addGroup(String groupname) {
+ public Group addGroup(String groupname) {
Group newGroup = new Group(groupname);
account.addGroup(newGroup);
groupTreeView.updateGroupNode(null);
+ return newGroup;
}
public void removeGroup(Group group) {
return selectedTree;
}
+ public void setSelectedTree(TreeView selected) {
+ selectedTree = selected;
+ }
+
public Folder getSelection() {
- return selectedTree.getSelection();
+ if (selectedTree != null)
+ return selectedTree.getSelection();
+ return null;
+ }
+
+ 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, true);
+ }
+
+ 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);
+ disableUploadArea();
+ updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true);
+ showRelevantToolbarButtons();
+ }
+ else {
+ if (getSelectedTree().equals(mysharedTreeView))
+ setSelectedTree(null);
+ if (getSelectedTree() == null)
+ 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);
+ applyPermissions(otherSharedTreeSelectionModel.getSelectedObject());
+ updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true, null);
+ showRelevantToolbarButtons();
+ }
+ else {
+ if (getSelectedTree().equals(otherSharedTreeView))
+ setSelectedTree(null);
+ if (getSelectedTree() == null)
+ 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, 1);
+ treeViews.add(otherSharedTreeView);
+ }
+ });
+ }
+
+ public native void log1(String message)/*-{
+ $wnd.console.log(message);
+ }-*/;
+
+ public String getErrorData() {
+ if (error != null)
+ return error.toString();
+ return "";
+ }
+
+ public void setError(Throwable t) {
+ error = t;
+ }
+
+ public void showRelevantToolbarButtons() {
+ toolbar.showRelevantButtons();
+ }
+
+ public FileUploadDialog getFileUploadDialog() {
+ if (fileUploadDialog == null)
+ fileUploadDialog = new FileUploadDialog(this);
+ return fileUploadDialog;
+ }
+
+ public void hideUploadIndicator() {
+ upload.removeStyleName("pithos-uploadButton-loading");
+ upload.setTitle("");
+ }
+
+ public void showUploadIndicator() {
+ upload.addStyleName("pithos-uploadButton-loading");
+ upload.setTitle("Upload in progress. Click for details.");
+ }
+
+ public void scheduleFolderHeadCommand(final Folder folder, final Command callback) {
+ if (folder == null) {
+ if (callback != null)
+ callback.execute();
+ }
+ else {
+ HeadRequest<Folder> headFolder = new HeadRequest<Folder>(Folder.class, getApiPath(), folder.getOwner(), folder.getUri(), folder) {
+
+ @Override
+ public void onSuccess(Folder _result) {
+ if (callback != null)
+ callback.execute();
+ }
+
+ @Override
+ public void onError(Throwable t) {
+ if (t instanceof RestException) {
+ if (((RestException) t).getHttpStatusCode() == Response.SC_NOT_FOUND) {
+ final String path = folder.getUri();
+ PutRequest newFolder = new PutRequest(getApiPath(), folder.getOwner(), path) {
+ @Override
+ public void onSuccess(Resource _result) {
+ scheduleFolderHeadCommand(folder, callback);
+ }
+
+ @Override
+ public void onError(Throwable _t) {
+ GWT.log("", _t);
+ 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();
+ }
+ };
+ newFolder.setHeader("X-Auth-Token", getToken());
+ newFolder.setHeader("Content-Type", "application/folder");
+ newFolder.setHeader("Accept", "*/*");
+ newFolder.setHeader("Content-Length", "0");
+ Scheduler.get().scheduleDeferred(newFolder);
+ }
+ else
+ displayError("Error heading folder: " + ((RestException) t).getHttpStatusText());
+ }
+ else
+ displayError("System error heading folder: " + t.getMessage());
+
+ GWT.log("Error heading folder", t);
+ setError(t);
+ }
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
+ };
+ headFolder.setHeader("X-Auth-Token", getToken());
+ Scheduler.get().scheduleDeferred(headFolder);
+ }
+ }
+
+ public void scheduleFileHeadCommand(File f, final Command callback) {
+ HeadRequest<File> headFile = new HeadRequest<File>(File.class, getApiPath(), f.getOwner(), f.getUri(), f) {
+
+ @Override
+ public void onSuccess(File _result) {
+ if (callback != null)
+ callback.execute();
+ }
+
+ @Override
+ public void onError(Throwable t) {
+ GWT.log("Error heading file", t);
+ setError(t);
+ if (t instanceof RestException)
+ displayError("Error heading file: " + ((RestException) t).getHttpStatusText());
+ else
+ displayError("System error heading file: " + t.getMessage());
+ }
+
+ @Override
+ protected void onUnauthorized(Response response) {
+ sessionExpired();
+ }
+ };
+ headFile.setHeader("X-Auth-Token", getToken());
+ Scheduler.get().scheduleDeferred(headFile);
+ }
+
+ public boolean isMySharedSelected() {
+ return getSelectedTree().equals(getMySharedTreeView());
+ }
+
+ private Folder getUploadFolder() {
+ if (folderTreeView.equals(getSelectedTree()) || otherSharedTreeView.equals(getSelectedTree())) {
+ return getSelection();
+ }
+ return null;
+ }
+
+ private void updateUploadFolder() {
+ updateUploadFolder(null);
+ }
+
+ private void updateUploadFolder(final JsArrayString urls) {
+ if (folderTreeView.equals(getSelectedTree()) || otherSharedTreeView.equals(getSelectedTree())) {
+ Folder f = getSelection();
+ if (getSelectedTree().equals(getFolderTreeView()))
+ updateFolder(f, true, new Command() {
+
+ @Override
+ public void execute() {
+ updateStatistics();
+ if (urls != null)
+ selectUploadedFiles(urls);
+ }
+ }, false);
+ else
+ updateOtherSharedFolder(f, true, null);
+ }
+ }
+
+ public native void disableUploadArea() /*-{
+ var uploader = $wnd.$("#uploader").pluploadQueue();
+ var dropElm = $wnd.document.getElementById('rightPanel');
+ $wnd.plupload.removeAllEvents(dropElm, uploader.id);
+ }-*/;
+
+ public native void enableUploadArea() /*-{
+ var uploader = $wnd.$("#uploader").pluploadQueue();
+ var dropElm = $wnd.document.getElementById('rightPanel');
+ $wnd.plupload.removeAllEvents(dropElm, uploader.id);
+ if (uploader.runtime == 'html5') {
+ uploader.settings.drop_element = 'rightPanel';
+ uploader.trigger('PostInit');
+ }
+ }-*/;
+
+ public void showUploadAlert(int nOfFiles) {
+ if (uploadAlert == null)
+ uploadAlert = new UploadAlert(this, nOfFiles);
+ if (!uploadAlert.isShowing())
+ uploadAlert.setPopupPositionAndShow(new PopupPanel.PositionCallback() {
+
+ @Override
+ public void setPosition(int offsetWidth, int offsetHeight) {
+ uploadAlert.setPopupPosition((Window.getClientWidth() - offsetWidth)/2, statusPanel.getAbsoluteTop() - offsetHeight);
+ }
+ });
+ uploadAlert.setNumOfFiles(nOfFiles);
+ }
+
+ public void hideUploadAlert() {
+ if (uploadAlert != null && uploadAlert.isShowing())
+ uploadAlert.hide();
+ }
+
+ public void selectUploadedFiles(JsArrayString urls) {
+ List<String> selectedUrls = new ArrayList<String>();
+ for (int i=0; i<urls.length(); i++)
+ selectedUrls.add(urls.get(i));
+ fileList.selectByUrl(selectedUrls);
}
}
projects / pithos-web-client / blobdiff