Automated merge with https://gss.googlecode.com/hg/

[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 9f85f2e..c786dbc 100644 (file)
--- a/src/gr/ebs/gss/client/GSS.java
+++ b/src/gr/ebs/gss/client/GSS.java
@@ -343,12 +343,12 @@ public class GSS implements EntryPoint, ResizeHandler {
                                                PopupTree popupTree = GSS.get().getFolders().getPopupTree();
                                                TreeItem treeObj = GSS.get().getFolders().getPopupTree().getTreeItem(historyToken);
                                                SelectionEvent.fire(popupTree, treeObj);
-                                               }
-                                       } catch (IndexOutOfBoundsException e) {
-                                               inner.selectTab(0);
-                                               }
                                        }
-                       });
+                               } catch (IndexOutOfBoundsException e) {
+                                       inner.selectTab(0);
+                               }
+                       }
+               });
 
                // Add the left and right panels to the split panel.
                splitPanel.setLeftWidget(folders);
@@ -816,10 +816,10 @@ public class GSS implements EntryPoint, ResizeHandler {
        }
 
        /**
-        * Reject illegal resource names, like '.' or '..'.
+        * Reject illegal resource names, like '.' or '..' or slashes '/'.
         */
        static boolean isValidResourceName(String name) {
-               if (".".equals(name) || "..".equals(name))
+               if (".".equals(name) || "..".equals(name) || name.contains("/"))
                        return false;
                return true;
        }