X-Git-Url: https://code.grnet.gr/git/pithos/blobdiff_plain/d8924393ddedfb6fcc07f5e68fea18436d4b7915..ce98bfc619a13df1884b185f3c9eb066f7738c8f:/src/gr/ebs/gss/client/GSS.java diff --git a/src/gr/ebs/gss/client/GSS.java b/src/gr/ebs/gss/client/GSS.java index b52b71c..af95cac 100644 --- a/src/gr/ebs/gss/client/GSS.java +++ b/src/gr/ebs/gss/client/GSS.java @@ -1,5 +1,5 @@ /* - * Copyright 2007, 2008, 2009 Electronic Business Systems Ltd. + * Copyright 2007, 2008, 2009, 2010 Electronic Business Systems Ltd. * * This file is part of GSS. * @@ -28,6 +28,7 @@ import gr.ebs.gss.client.rest.resource.FolderResource; import gr.ebs.gss.client.rest.resource.TrashResource; import gr.ebs.gss.client.rest.resource.UserResource; +import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -40,12 +41,15 @@ import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.event.logical.shared.SelectionEvent; import com.google.gwt.event.logical.shared.SelectionHandler; +import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.user.client.History; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.AbstractImagePrototype; @@ -62,7 +66,6 @@ import com.google.gwt.user.client.ui.TreeItem; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; - /** * Entry point classes define onModuleLoad(). */ @@ -80,13 +83,14 @@ public class GSS implements EntryPoint, ResizeHandler { * programmatic access to all the images needed by widgets. */ private static Images images = (Images) GWT.create(Images.class); + private GlassPanel glassPanel = new GlassPanel(); /** * An aggregate image bundle that pulls together all the images for this * application into a single bundle. */ - public interface Images extends ClientBundle,TopPanel.Images, StatusPanel.Images, FileMenu.Images, EditMenu.Images, SettingsMenu.Images, GroupMenu.Images, FilePropertiesDialog.Images, MessagePanel.Images, FileList.Images, SearchResults.Images, Search.Images, Groups.Images, Folders.Images { + public interface Images extends ClientBundle, TopPanel.Images, StatusPanel.Images, FileMenu.Images, EditMenu.Images, SettingsMenu.Images, GroupMenu.Images, FilePropertiesDialog.Images, MessagePanel.Images, FileList.Images, SearchResults.Images, Search.Images, Groups.Images, Folders.Images { @Source("gr/ebs/gss/resources/document.png") ImageResource folders(); @@ -149,7 +153,7 @@ public class GSS implements EntryPoint, ResizeHandler { /** * The group list widget. */ - private Groups groups = new Groups(images); + private Groups groups = new Groups(images); /** * The search result widget. @@ -157,12 +161,6 @@ public class GSS implements EntryPoint, ResizeHandler { private SearchResults searchResults; /** - * A widget that displays a message indicating that communication with the - * server is underway. - */ - private LoadingIndicator loading; - - /** * The tab panel that occupies the right side of the screen. */ private TabPanel inner = new DecoratedTabPanel(); @@ -205,6 +203,7 @@ public class GSS implements EntryPoint, ResizeHandler { private PickupDragController dragController; + @Override public void onModuleLoad() { // Initialize the singleton before calling the constructors of the // various widgets that might call GSS.get(). @@ -215,29 +214,30 @@ public class GSS implements EntryPoint, ResizeHandler { @Override public void previewDragStart() throws VetoDragException { - super.previewDragStart(); - if (context.selectedWidgets.isEmpty()) + super.previewDragStart(); + if (context.selectedWidgets.isEmpty()) throw new VetoDragException(); - if(context.draggable != null) - if(context.draggable instanceof DnDFocusPanel){ + if (context.draggable != null) + if (context.draggable instanceof DnDFocusPanel) { DnDFocusPanel toDrop = (DnDFocusPanel) context.draggable; - //prevent drag and drop for trashed files and for unselected tree items - if(toDrop.getFiles() != null && folders.isTrashItem(folders.getCurrent())) + // prevent drag and drop for trashed files and for + // unselected tree items + if (toDrop.getFiles() != null && folders.isTrashItem(folders.getCurrent())) throw new VetoDragException(); - else if(toDrop.getItem() != null && !toDrop.getItem().equals(folders.getCurrent())) + else if (toDrop.getItem() != null && !toDrop.getItem().equals(folders.getCurrent())) throw new VetoDragException(); - else if(toDrop.getItem() != null && !toDrop.getItem().isDraggable()) + else if (toDrop.getItem() != null && !toDrop.getItem().isDraggable()) throw new VetoDragException(); - } - else if(context.draggable instanceof DnDSimpleFocusPanel){ - DnDSimpleFocusPanel toDrop = (DnDSimpleFocusPanel) context.draggable; - //prevent drag and drop for trashed files and for unselected tree items - if(toDrop.getFiles() != null && folders.isTrashItem(folders.getCurrent())) + } else if (context.draggable instanceof DnDSimpleFocusPanel) { + DnDSimpleFocusPanel toDrop = (DnDSimpleFocusPanel) context.draggable; + // prevent drag and drop for trashed files and for + // unselected tree items + if (toDrop.getFiles() != null && folders.isTrashItem(folders.getCurrent())) throw new VetoDragException(); - } - } + } + } @Override protected Widget newDragProxy(DragContext aContext) { @@ -246,15 +246,14 @@ public class GSS implements EntryPoint, ResizeHandler { for (Iterator iterator = aContext.selectedWidgets.iterator(); iterator.hasNext();) { HTML html = null; Widget widget = (Widget) iterator.next(); - if(widget instanceof DnDFocusPanel){ + if (widget instanceof DnDFocusPanel) { DnDFocusPanel book = (DnDFocusPanel) widget; html = book.cloneHTML(); - } - else if(widget instanceof DnDSimpleFocusPanel){ + } else if (widget instanceof DnDSimpleFocusPanel) { DnDSimpleFocusPanel book = (DnDSimpleFocusPanel) widget; html = book.cloneHTML(); } - if(html == null) + if (html == null) container.add(new Label("Drag ME")); else container.add(html); @@ -297,22 +296,55 @@ public class GSS implements EntryPoint, ResizeHandler { @Override public void onSelection(SelectionEvent event) { - int tabIndex= event.getSelectedItem(); + int tabIndex = event.getSelectedItem(); +// TreeItem treeItem = GSS.get().getFolders().getCurrent(); switch (tabIndex) { - case 0: - fileList.clearSelectedRows(); - fileList.updateCurrentlyShowingStats(); - break; - case 1: - groups.updateCurrentlyShowingStats(); - break; - case 2: - searchResults.clearSelectedRows(); - searchResults.updateCurrentlyShowingStats(); - break; - } + case 0: +// Files tab selected + fileList.clearSelectedRows(); + fileList.updateCurrentlyShowingStats(); + break; + case 1: +// Groups tab selected + groups.updateCurrentlyShowingStats(); + updateHistory("Groups"); + break; + case 2: +// Search tab selected + searchResults.clearSelectedRows(); + searchResults.updateCurrentlyShowingStats(); + updateHistory("Search"); + break; + } } }); +// If the application starts with no history token, redirect to a new "Files" state + String initToken = History.getToken(); + if(initToken.length() == 0) + History.newItem("Files"); +// Add history listener to handle any history events + History.addValueChangeHandler(new ValueChangeHandler() { + @Override + public void onValueChange(ValueChangeEvent event) { + String tokenInput = event.getValue(); + String historyToken = handleSpecialFolderNames(tokenInput); + try { + if(historyToken.equals("Search")) + inner.selectTab(2); + else if(historyToken.equals("Groups")) + inner.selectTab(1); + else if(historyToken.equals("Files")|| historyToken.length()==0) + inner.selectTab(0); + else { + PopupTree popupTree = GSS.get().getFolders().getPopupTree(); + TreeItem treeObj = GSS.get().getFolders().getPopupTree().getTreeItem(historyToken); + SelectionEvent.fire(popupTree, treeObj); + } + } catch (IndexOutOfBoundsException e) { + inner.selectTab(0); + } + } + }); // Add the left and right panels to the split panel. splitPanel.setLeftWidget(folders); @@ -335,7 +367,6 @@ public class GSS implements EntryPoint, ResizeHandler { outer.setSpacing(4); - loading = new LoadingIndicator(); // Hook the window resize event, so that we can adjust the UI. Window.addResizeHandler(this); // Clear out the window's built-in margin, because we want to take @@ -348,6 +379,8 @@ public class GSS implements EntryPoint, ResizeHandler { // this in a deferred command causes it to occur after all widgets' // sizes have been computed by the browser. DeferredCommand.addCommand(new Command() { + + @Override public void execute() { onWindowResized(Window.getClientHeight()); } @@ -361,7 +394,7 @@ public class GSS implements EntryPoint, ResizeHandler { */ private void fetchUser(final String username) { String path = getApiPath() + username + "/"; - GetCommand getUserCommand = new GetCommand(UserResource.class, username, path){ + GetCommand getUserCommand = new GetCommand(UserResource.class, username, path, null) { @Override public void onComplete() { @@ -369,6 +402,8 @@ public class GSS implements EntryPoint, ResizeHandler { final String announcement = currentUserResource.getAnnouncement(); if (announcement != null) DeferredCommand.addCommand(new Command() { + + @Override public void execute() { displayInformation(announcement); } @@ -378,10 +413,10 @@ public class GSS implements EntryPoint, ResizeHandler { @Override public void onError(Throwable t) { GWT.log("Fetching user error", t); - if(t instanceof RestException) - GSS.get().displayError("No user found:"+((RestException)t).getHttpStatusText()); + if (t instanceof RestException) + GSS.get().displayError("No user found:" + ((RestException) t).getHttpStatusText()); else - GSS.get().displayError("System error fetching user data:"+t.getMessage()); + GSS.get().displayError("System error fetching user data:" + t.getMessage()); authenticateUser(); } }; @@ -395,9 +430,6 @@ public class GSS implements EntryPoint, ResizeHandler { Configuration conf = (Configuration) GWT.create(Configuration.class); String cookie = conf.authCookie(); String auth = Cookies.getCookie(cookie); - String domain = Window.Location.getHostName(); - String path = Window.Location.getPath(); - Cookies.setCookie(cookie, "", null, domain, path, false); if (auth == null) { authenticateUser(); // Redundant, but silences warnings about possible auth NPE, below. @@ -406,7 +438,7 @@ public class GSS implements EntryPoint, ResizeHandler { int sepIndex = auth.indexOf(conf.cookieSeparator()); if (sepIndex == -1) authenticateUser(); - token = auth.substring(sepIndex + 1, auth.length()); + token = auth.substring(sepIndex + 1); final String username = auth.substring(0, sepIndex); if (username == null) authenticateUser(); @@ -414,6 +446,8 @@ public class GSS implements EntryPoint, ResizeHandler { refreshWebDAVPassword(); DeferredCommand.addCommand(new Command() { + + @Override public void execute() { fetchUser(username); } @@ -429,10 +463,14 @@ public class GSS implements EntryPoint, ResizeHandler { } /** - * Redirect the user to the logout page. + * Clear the cookie and redirect the user to the logout page. */ void logout() { Configuration conf = (Configuration) GWT.create(Configuration.class); + String cookie = conf.authCookie(); + String domain = Window.Location.getHostName(); + String path = Window.Location.getPath(); + Cookies.setCookie(cookie, "", null, domain, path, false); Window.Location.assign(conf.logoutUrl()); } @@ -445,14 +483,10 @@ public class GSS implements EntryPoint, ResizeHandler { * @return the header HTML fragment */ private String createHeaderHTML(AbstractImagePrototype imageProto, String caption) { - String captionHTML = "" + "
" + imageProto.getHTML() + - " " + - caption + "
"; + String captionHTML = "" + "
" + imageProto.getHTML() + " " + caption + "
"; return captionHTML; } - private void onWindowResized(int height) { // Adjust the split panel to take up the available room in the window. int newHeight = height - splitPanel.getAbsoluteTop() - 44; @@ -467,15 +501,17 @@ public class GSS implements EntryPoint, ResizeHandler { onWindowResized(height); } - public boolean isFileListShowing(){ + public boolean isFileListShowing() { int tab = inner.getTabBar().getSelectedTab(); - if(tab == 0) return true; + if (tab == 0) + return true; return false; } - public boolean isSearchResultsShowing(){ + public boolean isSearchResultsShowing() { int tab = inner.getTabBar().getSelectedTab(); - if(tab == 2) return true; + if (tab == 2) + return true; return false; } @@ -496,6 +532,7 @@ public class GSS implements EntryPoint, ResizeHandler { /** * Make the file list visible. + * * @param update */ public void showFileList(boolean update) { @@ -519,6 +556,7 @@ public class GSS implements EntryPoint, ResizeHandler { /** * Make the search results visible. + * * @param query the search query string */ public void showSearchResults(String query) { @@ -531,14 +569,14 @@ public class GSS implements EntryPoint, ResizeHandler { * Display the 'loading' indicator. */ public void showLoadingIndicator() { - loading.center(); + topPanel.getLoading().setVisible(true); } /** * Hide the 'loading' indicator. */ public void hideLoadingIndicator() { - loading.hide(); + topPanel.getLoading().setVisible(false); } /** @@ -549,7 +587,7 @@ public class GSS implements EntryPoint, ResizeHandler { * @param y the new height */ public static native void resizeTo(int x, int y) /*-{ - $wnd.resizeTo(x,y); + $wnd.resizeTo(x,y); }-*/; /** @@ -643,7 +681,7 @@ public class GSS implements EntryPoint, ResizeHandler { return fileList; } - public SearchResults getSearchResults(){ + public SearchResults getSearchResults() { return searchResults; } @@ -665,12 +703,10 @@ public class GSS implements EntryPoint, ResizeHandler { return clipboard; } - - public StatusPanel getStatusPanel(){ + public StatusPanel getStatusPanel() { return statusPanel; } - /** * Retrieve the userDetailsPanel. * @@ -689,7 +725,7 @@ public class GSS implements EntryPoint, ResizeHandler { return dragController; } - public String getToken(){ + public String getToken() { return token; } @@ -697,7 +733,7 @@ public class GSS implements EntryPoint, ResizeHandler { return webDAVPassword; } - public void removeGlassPanel(){ + public void removeGlassPanel() { glassPanel.removeFromParent(); } @@ -720,12 +756,12 @@ public class GSS implements EntryPoint, ResizeHandler { } public static native void preventIESelection() /*-{ - $doc.body.onselectstart = function () { return false; }; + $doc.body.onselectstart = function () { return false; }; }-*/; public static native void enableIESelection() /*-{ if ($doc.body.onselectstart != null) - $doc.body.onselectstart = null; + $doc.body.onselectstart = null; }-*/; /** @@ -745,4 +781,44 @@ public class GSS implements EntryPoint, ResizeHandler { Cookies.setCookie(cookie, "", null, domain, path, false); } + /** + * History support for folder navigation + * adds a new browser history entry + * + * @param key + */ + public void updateHistory(String key){ +// Replace any whitespace of the initial string to "+" +// String result = key.replaceAll("\\s","+"); +// Add a new browser history entry. +// History.newItem(result); + History.newItem(key); + } + + /** + * This method examines the token input and add a "/" at the end in case it's omitted. + * This happens only in Files/trash/, Files/shared/, Files/others. + * + * @param tokenInput + * @return the formated token with a "/" at the end or the same tokenInput parameter + */ + + private String handleSpecialFolderNames(String tokenInput){ + List pathsToCheck = Arrays.asList("Files/trash", "Files/shared", "Files/others"); + if(pathsToCheck.contains(tokenInput)) + return tokenInput + "/"; + return tokenInput; + + } + + /** + * Reject illegal resource names, like '.' or '..'. + */ + static boolean isValidResourceName(String name) { + if (".".equals(name) || "..".equals(name)) + return false; + return true; + } + + }