litesoft

Explore

Commits

Diff Revisions 609 vs 610 for /trunk/Java/core/Anywhere/src/org/litesoft/core/util/UtilsCommon.java

		@@ -91,15 +91,18 @@
91	91
92	92		public static <T extends Enum<T>> T enumFromString( Class<T> pClass, String pEnumAsString )
93	93		{
94		-	if ( (pClass != null) && (null != (pEnumAsString = noEmpty( pEnumAsString ))) )
	94	+	if ( pClass != null )
95	95		{
96		-	try
	96	+	if ( null != (pEnumAsString = noEmpty( pEnumAsString )) )
97	97		{
98		-	return Enum.valueOf( pClass, pEnumAsString );
99		-	}
100		-	catch ( IllegalArgumentException ex )
101		-	{
102		-	// Bad String
	98	+	try
	99	+	{
	100	+	return Enum.valueOf( pClass, pEnumAsString );
	101	+	}
	102	+	catch ( IllegalArgumentException ex )
	103	+	{
	104	+	// Bad String
	105	+	}
103	106		}
104	107		}
105	108		return null;
		@@ -1050,8 +1053,8 @@
1050	1053		String[] rv = new String[pStringArrayToAssert.length];
1051	1054		for ( int i = 0; i < pStringArrayToAssert.length; i++ )
1052	1055		{
1053		-	String s = pStringArrayToAssert[i];
1054		-	if ( (s == null) \|\| ((s = s.trim()).length() == 0) )
	1056	+	String s = noEmpty( pStringArrayToAssert[i] );
	1057	+	if ( s == null )
1055	1058		{
1056	1059		nullOrEmpty( pErrorMessage + "[" + i + "]", "String[]" );
1057	1060		}