litesoft
Diff Revisions
949
vs
950
for /trunk/DeviceDesktopTest/src/org/litesoft/language/server/MasterUnvalidatedAccessorPropertyFile.java
|
@@ -1,8 +1,7 @@ |
1 |
1 |
|
package org.litesoft.language.server; |
2 |
2 |
|
|
3 |
3 |
|
import org.litesoft.commonfoundation.annotations.*; |
4 |
|
- |
import org.litesoft.commonfoundation.typeutils.Objects; |
5 |
|
- |
import org.litesoft.commonfoundation.typeutils.*; |
|
4 |
+ |
import org.litesoft.commonfoundation.base.*; |
6 |
5 |
|
import org.litesoft.language.model.*; |
7 |
6 |
|
|
8 |
7 |
|
import java.io.*; |
|
@@ -27,7 +26,7 @@ |
27 |
26 |
|
public @NullOrSignificantText String getValue( String pKey ) |
28 |
27 |
|
{ |
29 |
28 |
|
String zProperty = mPropertyFileAccessor.getProperty( pKey ); |
30 |
|
- |
return Strings.deNull( zProperty ).isEmpty() ? null : zProperty; |
|
29 |
+ |
return ConstrainTo.notNull( zProperty ).isEmpty() ? null : zProperty; |
31 |
30 |
|
} |
32 |
31 |
|
|
33 |
32 |
|
@Override |
|
@@ -58,13 +57,13 @@ |
58 |
57 |
|
public MasterUnvalidatedAccessorPropertyFile( String pPropertyFile ) |
59 |
58 |
|
throws IOException |
60 |
59 |
|
{ |
61 |
|
- |
this( new File( Strings.assertNotNullNotEmpty( "PropertyFile", pPropertyFile ) ) ); |
|
60 |
+ |
this( new File( Confirm.significant( "PropertyFile", pPropertyFile ) ) ); |
62 |
61 |
|
} |
63 |
62 |
|
|
64 |
63 |
|
public MasterUnvalidatedAccessorPropertyFile( File pPropertyFile ) |
65 |
64 |
|
throws IOException |
66 |
65 |
|
{ |
67 |
|
- |
this( new SimplePropertyFileAccessorImpl( Objects.assertNotNull( "PropertyFile", pPropertyFile ) ) ); |
|
66 |
+ |
this( new SimplePropertyFileAccessorImpl( Confirm.isNotNull( "PropertyFile", pPropertyFile ) ) ); |
68 |
67 |
|
} |
69 |
68 |
|
|
70 |
69 |
|
public MasterUnvalidatedAccessorPropertyFile( SimplePropertyFileAccessor pPropertyFileAccessor ) |