[Fudaa-svn-commit] SF.net SVN: fudaa:[7760] trunk/soft/fudaa-crue/crue-server/src/main

[<de...@us...>]

Revision: 7760
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7760&view=rev
Author:   deniger
Date:     2012-10-18 14:00:59 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
CRUE-322

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java
    trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties

Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java	2012-10-18 13:40:16 UTC (rev 7759)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java	2012-10-18 14:00:59 UTC (rev 7760)
@@ -82,6 +82,9 @@
     if (name.length() <= prefix.length()) {
       return false;
     }
+    if (name.length() > CruePrefix.NB_CAR_MAX) {
+      return false;
+    }
     return pattern.matcher(StringUtils.removeStart(name, prefix)).matches();
   }
 
@@ -92,6 +95,9 @@
     if (!name.startsWith(prefix)) {
       return BusinessMessages.getString("validation.name.prefix.error", prefix);
     }
+    if (name.length() > CruePrefix.NB_CAR_MAX) {
+      return BusinessMessages.getString("valid.nom.tooLong.short");
+    }
     boolean res = pattern.matcher(StringUtils.removeStart(name, prefix)).matches();
     if (!res) {
       return BusinessMessages.getString("validation.contentInvalid.error");
@@ -114,6 +120,10 @@
         return "validation.radical.prefix.error";
       }
     }
+    int length = 3 + radical.length();
+    if (length > CruePrefix.NB_CAR_MAX) {
+      return "valid.nom.tooLong.short";
+    }
     return null;
   }
 

Modified: trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2012-10-18 13:40:16 UTC (rev 7759)
+++ trunk/soft/fudaa-crue/crue-server/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties	2012-10-18 14:00:59 UTC (rev 7760)
@@ -329,6 +329,7 @@
 validation.noms          = Validation des noms pour Crue10
 valid.nom.notUnique                = Le nom {0} n''est pas unique.
 valid.nom.tooLong                  = Le nom {0} est trop long, il d\u00e9passe les 32 caract\u00e8res.
+valid.nom.tooLong.short                  = Le nom est trop long, il d\u00e9passe les 32 caract\u00e8res.
 valid.nom.tooLong.crue9            = Le nom {0} est trop long pour une sortie Crue9 (max 16 carac.)
 valid.nomEMHCasierProfil.tooLong.crue9      = Le nom du casierProfil {0} est trop long pour une sortie Crue9 (max 12 carac.)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.