You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by fr...@apache.org on 2004/02/19 22:04:03 UTC
cvs commit: jakarta-commons/lang/src/java/org/apache/commons/lang Validate.java Tokenizer.java NumberUtils.java CharUtils.java CharSetUtils.java
fredrik 2004/02/19 13:04:03
Modified: lang/src/java/org/apache/commons/lang Validate.java
Tokenizer.java NumberUtils.java CharUtils.java
CharSetUtils.java
Log:
Using StringUtils.isEmpty().
Revision Changes Path
1.11 +3 -3 jakarta-commons/lang/src/java/org/apache/commons/lang/Validate.java
Index: Validate.java
===================================================================
RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/Validate.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Validate.java 18 Feb 2004 22:59:50 -0000 1.10
+++ Validate.java 19 Feb 2004 21:04:03 -0000 1.11
@@ -356,7 +356,7 @@
* @throws IllegalArgumentException if the string is empty
*/
public static void notEmpty(String string, String message) {
- if (string == null || string.length() == 0) {
+ if (StringUtils.isEmpty(string)) {
throw new IllegalArgumentException(message);
}
}
@@ -375,7 +375,7 @@
* @throws IllegalArgumentException if the string is empty
*/
public static void notEmpty(String string) {
- if (string == null || string.length() == 0) {
+ if (StringUtils.isEmpty(string)) {
throw new IllegalArgumentException("The validated string is empty");
}
}
1.6 +2 -2 jakarta-commons/lang/src/java/org/apache/commons/lang/Tokenizer.java
Index: Tokenizer.java
===================================================================
RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/Tokenizer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Tokenizer.java 18 Feb 2004 22:59:50 -0000 1.5
+++ Tokenizer.java 19 Feb 2004 21:04:03 -0000 1.6
@@ -566,7 +566,7 @@
* @param tok the token to add
*/
private void addToken(List list, String tok) {
- if (tok == null || tok.length() == 0) {
+ if (StringUtils.isEmpty(tok)) {
if (ignoreEmptyTokens) {
return;
}
1.17 +2 -2 jakarta-commons/lang/src/java/org/apache/commons/lang/NumberUtils.java
Index: NumberUtils.java
===================================================================
RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/NumberUtils.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NumberUtils.java 18 Feb 2004 22:59:49 -0000 1.16
+++ NumberUtils.java 19 Feb 2004 21:04:03 -0000 1.17
@@ -608,7 +608,7 @@
* @return <code>true</code> if the string is a correctly formatted number
*/
public static boolean isNumber(String str) {
- if ((str == null) || (str.length() == 0)) {
+ if (StringUtils.isEmpty(str)) {
return false;
}
char[] chars = str.toCharArray();
1.4 +3 -3 jakarta-commons/lang/src/java/org/apache/commons/lang/CharUtils.java
Index: CharUtils.java
===================================================================
RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/CharUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CharUtils.java 18 Feb 2004 22:59:50 -0000 1.3
+++ CharUtils.java 19 Feb 2004 21:04:03 -0000 1.4
@@ -147,7 +147,7 @@
* @throws IllegalArgumentException if the String is empty
*/
public static char toCharacter(String str) {
- if (str == null || str.length() == 0) {
+ if (StringUtils.isEmpty(str)) {
throw new IllegalArgumentException("The String must not be empty");
}
return str.charAt(0);
@@ -169,7 +169,7 @@
* @return the char value of the Character or the default if null
*/
public static char toCharacter(String str, char defaultValue) {
- if (str == null || str.length() == 0) {
+ if (StringUtils.isEmpty(str)) {
return defaultValue;
}
return str.charAt(0);
1.32 +2 -2 jakarta-commons/lang/src/java/org/apache/commons/lang/CharSetUtils.java
Index: CharSetUtils.java
===================================================================
RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/CharSetUtils.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- CharSetUtils.java 18 Feb 2004 22:59:50 -0000 1.31
+++ CharSetUtils.java 19 Feb 2004 21:04:03 -0000 1.32
@@ -222,7 +222,7 @@
if (str == null) {
return null;
}
- if (str.length() == 0 || set == null || set.length() == 0) {
+ if (str.length() == 0 || StringUtils.isEmpty(set)) {
return "";
}
String[] strs = new String[1];
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org