fixing 'All tags' display version 2 - add a new css class named 'gss-tag'

[pithos] / 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 bda3d2b..af95cac 100644 (file)
--- a/src/gr/ebs/gss/client/GSS.java
+++ b/src/gr/ebs/gss/client/GSS.java
@@ -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,6 +41,8 @@ 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;
@@ -200,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().
@@ -293,24 +297,54 @@ public class GSS implements EntryPoint, ResizeHandler {
                        @Override
                        public void onSelection(SelectionEvent<Integer> event) {
                                int tabIndex = event.getSelectedItem();
+//                             TreeItem treeItem = GSS.get().getFolders().getCurrent();
                                switch (tabIndex) {
                                        case 0:
+//                                             Files tab selected
                                                fileList.clearSelectedRows();
                                                fileList.updateCurrentlyShowingStats();
-                                               History.newItem("Files");
                                                break;
                                        case 1:
+//                                             Groups tab selected
                                                groups.updateCurrentlyShowingStats();
-                                               History.newItem("Groups");
+                                       updateHistory("Groups");
                                                break;
                                        case 2:
+//                                             Search tab selected
                                                searchResults.clearSelectedRows();
                                                searchResults.updateCurrentlyShowingStats();
-                                               History.newItem("Search");
+                                       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<String>() {
+                       @Override
+                       public void onValueChange(ValueChangeEvent<String> 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);
@@ -346,6 +380,7 @@ public class GSS implements EntryPoint, ResizeHandler {
                // sizes have been computed by the browser.
                DeferredCommand.addCommand(new Command() {
 
+                       @Override
                        public void execute() {
                                onWindowResized(Window.getClientHeight());
                        }
@@ -368,6 +403,7 @@ public class GSS implements EntryPoint, ResizeHandler {
                                if (announcement != null)
                                        DeferredCommand.addCommand(new Command() {
 
+                                               @Override
                                                public void execute() {
                                                        displayInformation(announcement);
                                                }
@@ -402,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();
@@ -411,6 +447,7 @@ public class GSS implements EntryPoint, ResizeHandler {
 
                DeferredCommand.addCommand(new Command() {
 
+                       @Override
                        public void execute() {
                                fetchUser(username);
                        }
@@ -744,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<String> 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;
+       }
+
+
 }