litesoft

Explore

Commits

Diff Revisions 628 vs 629 for /trunk/GWT_Sandbox/FormEngine/src/com/temp/shared/validators/IdentifierValueValidator.java

		@@ -4,30 +4,25 @@
4	4		import com.temp.shared.externalization.*;
5	5		import com.temp.shared.utils.*;
6	6
7		-	public class IdentifierValueValidator implements ValueValidator
	7	+	public class IdentifierValueValidator implements ValueValidator<String>
8	8		{
9	9		public static final String TEMPLATE_ID_CODE = "NotIdentifier";
10	10		public static final String TEMPLATE_NAME_WHY = "why";
11		-	public static final String SUBTEMPLATE_WHY_NOT_STRING = "NotString";
12	11		public static final String SUBTEMPLATE_WHY_EMPTY_STRING = "EmptyString";
13	12		public static final String SUBTEMPLATE_WHY_BAD_CHAR = "BadCharacter";
14	13		public static final String USER_DATA_POSITION = "position";
15	14		public static final String USER_DATA_CHAR = "character";
16	15
17		-	public static final ValueValidator INSTANCE = new IdentifierValueValidator();
	16	+	public static final ValueValidator<String> INSTANCE = new IdentifierValueValidator();
18	17
19	18		private IdentifierValueValidator()
20	19		{
21	20		}
22	21
23	22		@Override
24		-	public E13nData checkValue( Object value )
	23	+	public E13nData checkValue( String value )
25	24		{
26		-	if ( !(value instanceof String) )
27		-	{
28		-	return new E13nData( TEMPLATE_ID_CODE ).addSubstitutionNamedSubTemplateIdCode( TEMPLATE_NAME_WHY, SUBTEMPLATE_WHY_NOT_STRING );
29		-	}
30		-	String userData = value.toString().trim();
	25	+	String userData = StringUtils.deNull( value ).trim();
31	26		if ( userData.length() == 0 )
32	27		{
33	28		return new E13nData( TEMPLATE_ID_CODE ).addSubstitutionNamedSubTemplateIdCode( TEMPLATE_NAME_WHY, SUBTEMPLATE_WHY_EMPTY_STRING );