Changeset 20765

Timestamp:

02/03/10 13:57:29 (2 years ago)

Author:

rns

Message:

Fix bug that set empty bag names if whitespace was entered as a bag name.

Location:

trunk/intermine

Files:

• api/main/src/org/intermine/api/util/NameUtil.java (modified) (1 diff)
• api/test/src/org/intermine/api/util/NameUtilTest.java (modified) (1 diff)
• web/main/src/org/intermine/dwr/AjaxServices.java (modified) (1 diff)

trunk/intermine/api/main/src/org/intermine/api/util/NameUtil.java

@@ -86 +86 @@
 
     private static boolean validateName(String name, boolean specialChars) {
-        if (StringUtils.isEmpty(name)) {
+        if (StringUtils.isBlank(name)) {
             return false;
         }

trunk/intermine/api/test/src/org/intermine/api/util/NameUtilTest.java

@@ -15 +15 @@
     public void testIsValidName() {
         assertFalse(NameUtil.isValidName(""));
+        assertFalse(NameUtil.isValidName(" "));
         assertTrue(NameUtil.isValidName("valid"));
         assertTrue(NameUtil.isValidName("1234567890"));

trunk/intermine/web/main/src/org/intermine/dwr/AjaxServices.java

@@ -657 +657 @@
             BagManager bagManager = im.getBagManager();
 
+            bagName = bagName.trim();
             // TODO get message text from the properties file
             if (bagName.equals("")) {