Browse Source

-remove Java1.4 specific methods from parseHumanSizes

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@486465 13f79535-47bb-0310-9956-ffa450edef68
master
Kevin Jackson 18 years ago
parent
commit
f8e6703fc8
1 changed files with 3 additions and 5 deletions
  1. +3
    -5
      src/main/org/apache/tools/ant/util/StringUtils.java

+ 3
- 5
src/main/org/apache/tools/ant/util/StringUtils.java View File

@@ -201,8 +201,8 @@ public final class StringUtils {
final long GIGABYTE = MEGABYTE * 1024;
final long TERABYTE = GIGABYTE * 1024;
final long PETABYTE = TERABYTE * 1024;
String regex = "\\d+[K|M|G|T|P]";
if(humanSize.matches(regex)) {
//last character isn't a digit
if(!Character.isDigit(humanSize.charAt(humanSize.length()-1))) {
char c = humanSize.charAt(humanSize.length()-1);
long value = Long.valueOf(humanSize.substring(0, humanSize.length()-1)).longValue();
switch (c) {
@@ -219,10 +219,8 @@ public final class StringUtils {
default:
return value;
}
} else if(humanSize.matches("\\d+")) {
return Long.parseLong(humanSize);
} else {
throw new Exception("Couldn't parse string: "+humanSize);
return Long.parseLong(humanSize);
}
}
}

Loading…
Cancel
Save