[Fudaa-svn-commit] SF.net SVN: fudaa:[7341] trunk/soft/fudaa-crue

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

Revision: 7341
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7341&view=rev
Author:   deniger
Date:     2012-06-14 21:29:53 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java
    trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf

Added Paths:
-----------
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionRename.java

Added: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionRename.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionRename.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionRename.java	2012-06-14 21:29:53 UTC (rev 7341)
@@ -0,0 +1,15 @@
+package org.fudaa.dodico.crue.edition;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
+import org.fudaa.dodico.crue.metier.factory.CruePrefix;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class EditionRename {
+
+ 
+}

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-06-14 21:12:15 UTC (rev 7340)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java	2012-06-14 21:29:53 UTC (rev 7341)
@@ -1,5 +1,7 @@
 package org.fudaa.dodico.crue.validation;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
 import org.apache.commons.lang.StringUtils;
@@ -23,10 +25,15 @@
   }
 
   public static boolean isNameValide(String name, EnumCatEMH type) {
+
+    String prefix = CruePrefix.getPrefix(type);
+    return isNameValid(name, prefix);
+  }
+
+  private static boolean isNameValid(String name, String prefix) {
     if (StringUtils.isBlank(name)) {
       return false;
     }
-    String prefix = CruePrefix.getPrefix(type);
     if (!name.startsWith(prefix)) {
       return false;
     }
@@ -36,6 +43,17 @@
     return getNamePattern().matcher(StringUtils.removeStart(name, prefix)).matches();
   }
 
+  public static List<String> findInvalidName(List<String> name, EnumCatEMH type) {
+    String prefix = CruePrefix.getPrefix(type);
+    List<String> res = new ArrayList<String>();
+    for (String string : name) {
+      if (!isNameValid(string, prefix)) {
+        res.add(string);
+      }
+    }
+    return name;
+  }
+
   public static String isRadicalValideMsg(String radical) {
     if (StringUtils.isBlank(radical)) {
       return "validation.name.isBlank.error";

Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf	2012-06-14 21:12:15 UTC (rev 7340)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf	2012-06-14 21:29:53 UTC (rev 7341)
@@ -1,6 +1,6 @@
 # ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}/.${APPNAME}/0.54/"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.54/"
+default_userdir="${HOME}/.${APPNAME}/0.54-SNAPSHOT/"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.54-SNAPSHOT/"
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches

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