From f8e6703fc89b0eb2cd97c1486b4e48dc2ff15c5d Mon Sep 17 00:00:00 2001 From: Kevin Jackson Date: Wed, 13 Dec 2006 02:36:23 +0000 Subject: [PATCH] -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 --- src/main/org/apache/tools/ant/util/StringUtils.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java index c71990362..14c91cad4 100644 --- a/src/main/org/apache/tools/ant/util/StringUtils.java +++ b/src/main/org/apache/tools/ant/util/StringUtils.java @@ -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); } } }