litesoft

Explore

Commits

Diff Revisions 803 vs 804 for /trunk/Java/core/Anywhere/src/org/litesoft/core/util/externalization/HelperE13nResolver.java

		@@ -2,6 +2,7 @@
2	2
3	3		import java.util.*;
4	4
	5	+	import org.litesoft.core.typeutils.*;
5	6		import org.litesoft.core.util.*;
6	7		import org.litesoft.core.util.externalization.E13nData.*;
7	8
		@@ -52,7 +53,7 @@
52	53		*/
53	54		public static NonCompleting validateProxy( E13nResolver proxied )
54	55		{
55		-	UtilsCommon.assertNotNull( "Proxied E13nResolver", proxied );
	56	+	Objects.assertNotNull( "Proxied E13nResolver", proxied );
56	57		if ( proxied instanceof NonCompleting )
57	58		{
58	59		return (NonCompleting) proxied;
		@@ -68,7 +69,7 @@
68	69		*/
69	70		public static String resolveDataWith( E13nData data, NonCompleting resolver )
70	71		{
71		-	UtilsCommon.assertNotNull( "E13nData data", data );
	72	+	Objects.assertNotNull( "E13nData data", data );
72	73		String key = data.getTemplateIdCode();
73	74		return processResolvedWithSubKeys( key, resolver.resolveWithoutCompleting( key ), resolver, data.getTemplateSubstitutionNamedValues() );
74	75		}
		@@ -81,7 +82,7 @@
81	82		*/
82	83		public static String resolveEnumWith( Enum<?> key, NonCompleting resolver )
83	84		{
84		-	UtilsCommon.assertNotNull( "Enum key", key );
	85	+	Objects.assertNotNull( "Enum key", key );
85	86		String keyName = key.name();
86	87		String prefix = UtilsCommon.justClassNameOf( key );
87	88		String value = resolver.resolveWithoutCompleting( prefix + E13nResolver.PREFIX_SEP + keyName );