litesoft
Diff Revisions
948
vs
950
for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/persist/lines/SubSystemLinesPersister.java
|
@@ -4,8 +4,8 @@ |
4 |
4 |
|
import org.litesoft.aokeyhole.objects.support.*; |
5 |
5 |
|
import org.litesoft.aokeyhole.persist.*; |
6 |
6 |
|
import org.litesoft.aokeyhole.toolkit.*; |
|
7 |
+ |
import org.litesoft.commonfoundation.base.*; |
7 |
8 |
|
import org.litesoft.commonfoundation.typeutils.*; |
8 |
|
- |
import org.litesoft.commonfoundation.typeutils.Objects; |
9 |
9 |
|
|
10 |
10 |
|
import java.io.*; |
11 |
11 |
|
import java.util.*; |
|
@@ -18,7 +18,7 @@ |
18 |
18 |
|
private final LinesPersister mLinesPersister; |
19 |
19 |
|
|
20 |
20 |
|
public SubSystemLinesPersister( LinesPersister pLinesPersister ) { |
21 |
|
- |
mLinesPersister = Objects.assertNotNull( "LinesPersister", pLinesPersister ); |
|
21 |
+ |
mLinesPersister = Confirm.isNotNull( "LinesPersister", pLinesPersister ); |
22 |
22 |
|
} |
23 |
23 |
|
|
24 |
24 |
|
@Override |
|
@@ -274,10 +274,10 @@ |
274 |
274 |
|
@Override |
275 |
275 |
|
public final void addProperty( String pName, String pValue, String... pAdditionalValues ) { |
276 |
276 |
|
checkCanAddProperty( getWhyCantAddProperty() ); |
277 |
|
- |
pValue = Strings.deNull( pValue ); |
|
277 |
+ |
pValue = ConstrainTo.notNull( pValue ); |
278 |
278 |
|
if ( pAdditionalValues != null ) { |
279 |
279 |
|
for ( String zValue : pAdditionalValues ) { |
280 |
|
- |
pValue += "|" + Strings.deNull( zValue ); |
|
280 |
+ |
pValue += "|" + ConstrainTo.notNull( zValue ); |
281 |
281 |
|
} |
282 |
282 |
|
} |
283 |
283 |
|
if ( pValue.length() != 0 ) { |
|
@@ -314,7 +314,7 @@ |
314 |
314 |
|
sb.append( pType ).append( ':' ).append( pName ); |
315 |
315 |
|
if ( pAdditionalValues != null ) { |
316 |
316 |
|
for ( String zValue : pAdditionalValues ) { |
317 |
|
- |
sb.append( '|' ).append( Strings.deNull( zValue ) ); |
|
317 |
+ |
sb.append( '|' ).append( ConstrainTo.notNull( zValue ) ); |
318 |
318 |
|
} |
319 |
319 |
|
} |
320 |
320 |
|
mCollector.add( sb.toString() ); |