diff -r 7cee158cb8cd -r 26b2b12093af javacommons/utils/javasrc/com/nokia/mj/impl/utils/Version.java --- a/javacommons/utils/javasrc/com/nokia/mj/impl/utils/Version.java Wed Sep 15 12:05:25 2010 +0300 +++ b/javacommons/utils/javasrc/com/nokia/mj/impl/utils/Version.java Wed Oct 13 14:23:59 2010 +0300 @@ -58,12 +58,7 @@ { return null; } - // Remove all invalid characters from string - String str = normalizeVersion(aStr); - if (str.length() == 0) - { - return null; - } + String str = aStr.trim(); int major = 0; int minor = 0; @@ -237,23 +232,4 @@ } return buf.toString(); } - - /** - * Remove the illegal characters from version string, - * for example "1.1 rev.2" becomes "1.1.2" - */ - private static String normalizeVersion(String aString) - { - StringBuffer buf = new StringBuffer(); - int len = aString.length(); - for (int ind = 0; ind < len; ind++) - { - char ch = aString.charAt(ind); - if ((ch == '.') || Character.isDigit(ch)) - { - buf.append(ch); - } - } - return buf.toString(); - } }