X-Git-Url: https://code.grnet.gr/git/pithos-web-client/blobdiff_plain/80a65a5fca6cef760c90b64df81e6a1c93bcc66a..refs/tags/v0.9.1:/src/gr/grnet/pithos/web/client/Pithos.java diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java index 3f3e0f3..992916f 100644 --- a/src/gr/grnet/pithos/web/client/Pithos.java +++ b/src/gr/grnet/pithos/web/client/Pithos.java @@ -62,6 +62,7 @@ import java.util.Set; 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; @@ -76,12 +77,13 @@ 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.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.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; @@ -92,11 +94,13 @@ 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.PopupPanel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.view.client.SelectionChangeEvent; @@ -114,6 +118,35 @@ public class Pithos implements EntryPoint, ResizeHandler { 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. @@ -132,8 +165,8 @@ public class Pithos implements EntryPoint, ResizeHandler { 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) { @@ -144,12 +177,16 @@ public class Pithos implements EntryPoint, ResizeHandler { mysharedTreeView.updateRoot(); } - public void updateSharedFolder(Folder f, boolean showfiles) { - mysharedTreeView.updateFolder(f, showfiles); + public void updateSharedFolder(Folder f, boolean showfiles, Command callback) { + mysharedTreeView.updateFolder(f, showfiles, callback); } - public void updateOtherSharedFolder(Folder f, boolean showfiles) { - otherSharedTreeView.updateFolder(f, showfiles); + public void updateSharedFolder(Folder f, boolean showfiles) { + updateSharedFolder(f, showfiles, null); + } + + public void updateOtherSharedFolder(Folder f, boolean showfiles, Command callback) { + otherSharedTreeView.updateFolder(f, showfiles, callback); } public MysharedTreeView getMySharedTreeView() { @@ -190,7 +227,7 @@ public class Pithos implements EntryPoint, ResizeHandler { /** * The bottom panel that contains the status bar. */ - private StatusPanel statusPanel = null; + StatusPanel statusPanel = null; /** * The file list widget. @@ -238,7 +275,7 @@ public class Pithos implements EntryPoint, ResizeHandler { OtherSharedTreeView otherSharedTreeView = null; GroupTreeViewModel groupTreeViewModel; - private GroupTreeView groupTreeView; + GroupTreeView groupTreeView; TreeView selectedTree; protected AccountResource account; @@ -249,20 +286,16 @@ public class Pithos implements EntryPoint, ResizeHandler { @SuppressWarnings("rawtypes") List selectionModels = new ArrayList(); - Button upload; - - private HTML usedBytes; - - private HTML totalBytes; - - private HTML usedPercent; + public Button upload; private HTML numOfFiles; private Toolbar toolbar; - private FileUploadDialog fileUploadDialog; - + private FileUploadDialog fileUploadDialog = new FileUploadDialog(this); + + UploadAlert uploadAlert; + @Override public void onModuleLoad() { if (parseUserCredentials()) @@ -270,6 +303,7 @@ public class Pithos implements EntryPoint, ResizeHandler { } private void initialize() { + resources.pithosCss().ensureInjected(); boolean bareContent = Window.Location.getParameter("noframe") != null; String contentWidth = bareContent ? "100%" : "75%"; @@ -327,7 +361,7 @@ public class Pithos implements EntryPoint, ResizeHandler { header.setCellWidth(folderStatistics, "40px"); outer.add(header); outer.setCellHorizontalAlignment(header, HasHorizontalAlignment.ALIGN_CENTER); - // Inner contains the various lists.nner + // Inner contains the various lists inner.sinkEvents(Event.ONCONTEXTMENU); inner.setWidth("100%"); @@ -345,7 +379,7 @@ public class Pithos implements EntryPoint, ResizeHandler { public void execute() { updateStatistics(); } - }); + }, true); showRelevantToolbarButtons(); } else { @@ -362,43 +396,19 @@ public class Pithos implements EntryPoint, ResizeHandler { folderTreeView = new FolderTreeView(folderTreeViewModel); treeViews.add(folderTreeView); - fileList = new FileList(this, images, folderTreeView); + fileList = new FileList(this, images); inner.add(fileList); - groupTreeViewModel = new GroupTreeViewModel(this); - groupTreeView = new GroupTreeView(groupTreeViewModel); - treeViews.add(groupTreeView); - trees = new VerticalPanel(); trees.setWidth("100%"); - - HorizontalPanel treeHeader = new HorizontalPanel(); - treeHeader.addStyleName("pithos-treeHeader"); - treeHeader.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER); - treeHeader.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); - HorizontalPanel statistics = new HorizontalPanel(); - statistics.addStyleName("pithos-statistics"); - 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); - treeHeader.setCellHorizontalAlignment(statistics, HasHorizontalAlignment.ALIGN_LEFT); - trees.add(treeHeader); - - trees.add(folderTreeView); - trees.add(groupTreeView); // Add the left and right panels to the split panel. splitPanel.setLeftWidget(trees); - splitPanel.setRightWidget(inner); - splitPanel.setSplitPosition("35%"); + 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); @@ -425,14 +435,17 @@ public class Pithos implements EntryPoint, ResizeHandler { // 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() { @@ -450,6 +463,7 @@ public class Pithos implements EntryPoint, ResizeHandler { trash = f; break; } + trees.add(folderTreeView); folderTreeViewModel.initialize(account, new Command() { @Override @@ -457,57 +471,67 @@ public class Pithos implements EntryPoint, ResizeHandler { createMySharedTree(); } }); - groupTreeViewModel.initialize(); - showStatistics(); + + 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); -// else if (getSelectedTree().equals(mysharedTreeView)) -// updateSharedFolder(f, true); -// } -// return true; -// } -// }, 3000); + 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 (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.getSelectedObject() != null) s.setSelected(s.getSelectedObject(), false); @@ -526,31 +550,25 @@ public class Pithos implements EntryPoint, ResizeHandler { * 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); Dictionary otherProperties = Dictionary.getDictionary("otherProperties"); - if (username == null || username.length() == 0 || token == null || token.length() == 0) { - String cookie = otherProperties.get("authCookie"); - String auth = Cookies.getCookie(cookie); - if (auth == null) { - 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(); - return false; - } - username = authSplit[0]; - token = authSplit[1]; + String cookie = otherProperties.get("authCookie"); + String auth = Cookies.getCookie(cookie); + if (auth == null) { + authenticateUser(); + return false; } - else - Cookies.setCookie(otherProperties.get("authCookie"), username + conf.cookieSeparator() + token, null, "", "/", 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(); + return false; + } + username = authSplit[0]; + token = authSplit[1]; String gotoUrl = Window.Location.getParameter("goto"); if (gotoUrl != null && gotoUrl.length() > 0) { @@ -568,7 +586,7 @@ public class Pithos implements EntryPoint, ResizeHandler { 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 getAccount = new GetRequest(AccountResource.class, getApiPath(), username, path) { @@ -603,7 +621,7 @@ public class Pithos implements EntryPoint, ResizeHandler { @Override public void onSuccess(AccountResource _result) { - showStatistics(); + folderTreeView.showStatistics(account); } @Override @@ -625,13 +643,6 @@ public class Pithos implements EntryPoint, ResizeHandler { Scheduler.get().scheduleDeferred(headAccount); } - protected void showStatistics() { - usedBytes.setHTML(String.valueOf(account.getFileSizeAsString())); - totalBytes.setHTML(String.valueOf(account.getQuotaAsString())); - 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) { @@ -707,13 +718,19 @@ public class Pithos implements EntryPoint, ResizeHandler { protected void onWindowResized(int height) { // Adjust the split panel to take up the available room in the window. - int newHeight = height - splitPanel.getAbsoluteTop(); + 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(); @@ -727,6 +744,7 @@ public class Pithos implements EntryPoint, ResizeHandler { */ public void displayError(String msg) { messagePanel.displayError(msg); + onWindowResized(Window.getClientHeight()); } /** @@ -736,6 +754,7 @@ public class Pithos implements EntryPoint, ResizeHandler { */ public void displayWarning(String msg) { messagePanel.displayWarning(msg); + onWindowResized(Window.getClientHeight()); } /** @@ -745,6 +764,7 @@ public class Pithos implements EntryPoint, ResizeHandler { */ public void displayInformation(String msg) { messagePanel.displayInformation(msg); + onWindowResized(Window.getClientHeight()); } /** @@ -813,7 +833,7 @@ public class Pithos implements EntryPoint, ResizeHandler { History.newItem(key); } - public void deleteFolder(final Folder folder) { + 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("X-Auth-Token", getToken()); @@ -826,7 +846,7 @@ public class Pithos implements EntryPoint, ResizeHandler { JSONArray array = json.isArray(); int i = 0; if (array != null) { - deleteObject(folder, i, array); + deleteObject(folder, i, array, callback); } } } @@ -842,7 +862,7 @@ public class Pithos implements EntryPoint, ResizeHandler { } } - 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")) { @@ -851,7 +871,7 @@ public class Pithos implements EntryPoint, ResizeHandler { DeleteRequest delete = new DeleteRequest(getApiPath(), folder.getOwner(), URL.encode(path)) { @Override public void onSuccess(Resource result) { - deleteObject(folder, i + 1, array); + deleteObject(folder, i + 1, array, callback); } @Override @@ -888,7 +908,7 @@ public class Pithos implements EntryPoint, ResizeHandler { array.set(l++, array2.get(j)); } } - deleteObject(folder, i + 1, array); + deleteObject(folder, i + 1, array, callback); } } @@ -912,9 +932,12 @@ public class Pithos implements EntryPoint, ResizeHandler { @Override public void execute() { + folderTreeSelectionModel.setSelected(folder.getParent(), true); updateStatistics(); + if (callback != null) + callback.execute(); } - }); + }, true); } @Override @@ -1070,17 +1093,18 @@ public class Pithos implements EntryPoint, ResizeHandler { } 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) { @@ -1097,7 +1121,9 @@ public class Pithos implements EntryPoint, ResizeHandler { } public Folder getSelection() { - return selectedTree.getSelection(); + if (selectedTree != null) + return selectedTree.getSelection(); + return null; } public void showFolderStatistics(int folderFileCount) { @@ -1113,7 +1139,7 @@ public class Pithos implements EntryPoint, ResizeHandler { } public void updateRootFolder(Command callback) { - updateFolder(account.getPithos(), false, callback); + updateFolder(account.getPithos(), false, callback, true); } void createMySharedTree() { @@ -1124,6 +1150,7 @@ public class Pithos implements EntryPoint, ResizeHandler { if (mysharedTreeSelectionModel.getSelectedObject() != null) { deselectOthers(mysharedTreeView, mysharedTreeSelectionModel); upload.setEnabled(false); + disableUploadArea(); updateSharedFolder(mysharedTreeSelectionModel.getSelectedObject(), true); showRelevantToolbarButtons(); } @@ -1156,9 +1183,8 @@ public class Pithos implements EntryPoint, ResizeHandler { public void onSelectionChange(SelectionChangeEvent event) { if (otherSharedTreeSelectionModel.getSelectedObject() != null) { deselectOthers(otherSharedTreeView, otherSharedTreeSelectionModel); - otherSharedTreeView.addStyleName("cellTreeWidget-selectedTree"); applyPermissions(otherSharedTreeSelectionModel.getSelectedObject()); - updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true); + updateOtherSharedFolder(otherSharedTreeSelectionModel.getSelectedObject(), true, null); showRelevantToolbarButtons(); } else { @@ -1176,7 +1202,7 @@ public class Pithos implements EntryPoint, ResizeHandler { @Override public void execute() { otherSharedTreeView = new OtherSharedTreeView(otherSharedTreeViewModel); - trees.insert(otherSharedTreeView, 3); + trees.insert(otherSharedTreeView, 1); treeViews.add(otherSharedTreeView); } }); @@ -1310,4 +1336,79 @@ public class Pithos implements EntryPoint, ResizeHandler { 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 selectedUrls = new ArrayList(); + for (int i=0; i