litesoft
Diff Revisions
808
vs
809
for /trunk/Java/core/Anywhere/src/org/litesoft/core/typeutils/Strings.java
|
@@ -117,12 +117,12 @@ |
117 |
117 |
|
|
118 |
118 |
|
public static boolean contains( String pString, String pToFind ) |
119 |
119 |
|
{ |
120 |
|
- |
return UtilsCommon.isNotNull( pString ) && isNotNullOrEmpty( pToFind ) && pString.contains( pToFind ); |
|
120 |
+ |
return Objects.isNotNull( pString ) && isNotNullOrEmpty( pToFind ) && pString.contains( pToFind ); |
121 |
121 |
|
} |
122 |
122 |
|
|
123 |
123 |
|
public static boolean contains( String pString, char pToFind ) |
124 |
124 |
|
{ |
125 |
|
- |
return UtilsCommon.isNotNull( pString ) && (-1 != pString.indexOf( pToFind )); |
|
125 |
+ |
return Objects.isNotNull( pString ) && (-1 != pString.indexOf( pToFind )); |
126 |
126 |
|
} |
127 |
127 |
|
|
128 |
128 |
|
public static String noEmpty( String pString ) |
|
@@ -414,13 +414,13 @@ |
414 |
414 |
|
return (value == null) ? "" : value.toString(); |
415 |
415 |
|
} |
416 |
416 |
|
|
417 |
|
- |
public static void nullOrEmptyOrSpace( String pErrorMessage, String pForm ) |
|
417 |
+ |
public static void errorNullOrEmptyOrSpace( String pErrorMessage, String pForm ) |
418 |
418 |
|
throws IllegalArgumentException |
419 |
419 |
|
{ |
420 |
420 |
|
error( pForm, pErrorMessage, " not allowed to be null or empty or have any spaces" ); |
421 |
421 |
|
} |
422 |
422 |
|
|
423 |
|
- |
public static void nullOrEmpty( String pErrorMessage, String pForm ) |
|
423 |
+ |
public static void errorNullOrEmpty( String pErrorMessage, String pForm ) |
424 |
424 |
|
throws IllegalArgumentException |
425 |
425 |
|
{ |
426 |
426 |
|
error( pForm, pErrorMessage, " not allowed to be null or empty" ); |