litesoft
Diff Revisions
725
vs
726
for /trunk/Java/core/Anywhere/src/org/litesoft/core/util/externalization/E13nData.java
|
@@ -2,7 +2,7 @@ |
2 |
2 |
|
|
3 |
3 |
|
import java.util.*; |
4 |
4 |
|
|
5 |
|
- |
import com.temp.shared.utils.*; |
|
5 |
+ |
import org.litesoft.core.util.*; |
6 |
6 |
|
|
7 |
7 |
|
/** |
8 |
8 |
|
* Externalization Data to be used with an Externally Sourced String keyed |
|
@@ -62,12 +62,12 @@ |
62 |
62 |
|
*/ |
63 |
63 |
|
public E13nData( Object templateIdCode ) |
64 |
64 |
|
{ |
65 |
|
- |
this.templateIdCode = Assert.noEmptyToString( "templateIdCode", templateIdCode ); |
|
65 |
+ |
this.templateIdCode = UtilsCommon.assertNoEmptyToString( "templateIdCode", templateIdCode ); |
66 |
66 |
|
} |
67 |
67 |
|
|
68 |
68 |
|
private synchronized E13nData addPair( boolean userData, String name, String value ) |
69 |
69 |
|
{ |
70 |
|
- |
name = Assert.noEmpty( "name", name ); |
|
70 |
+ |
name = UtilsCommon.assertNotNullNotEmpty( "name", name ); |
71 |
71 |
|
if ( templateSubstitutionNamedValues == null ) |
72 |
72 |
|
{ |
73 |
73 |
|
templateSubstitutionNamedValues = new HashMap<String, SubstitutionValue>(); |
|
@@ -84,7 +84,7 @@ |
84 |
84 |
|
*/ |
85 |
85 |
|
public E13nData addSubstitutionNamedUserData( String name, String userData ) |
86 |
86 |
|
{ |
87 |
|
- |
return addPair( true, name, StringUtils.deNull( userData ) ); |
|
87 |
+ |
return addPair( true, name, UtilsCommon.deNull( userData ) ); |
88 |
88 |
|
} |
89 |
89 |
|
|
90 |
90 |
|
/** |
|
@@ -95,7 +95,7 @@ |
95 |
95 |
|
*/ |
96 |
96 |
|
public E13nData addSubstitutionNamedSubTemplateIdCode( String name, String subTemplateIdCode ) |
97 |
97 |
|
{ |
98 |
|
- |
return addPair( false, name, Assert.noEmpty( "subTemplateIdCode", subTemplateIdCode ) ); |
|
98 |
+ |
return addPair( false, name, UtilsCommon.assertNotNullNotEmpty( "subTemplateIdCode", subTemplateIdCode ) ); |
99 |
99 |
|
} |
100 |
100 |
|
|
101 |
101 |
|
/** |