Index: lutinutil/src/java/org/codelutin/util/StringUtil.java diff -u lutinutil/src/java/org/codelutin/util/StringUtil.java:1.21 lutinutil/src/java/org/codelutin/util/StringUtil.java:1.22 --- lutinutil/src/java/org/codelutin/util/StringUtil.java:1.21 Mon Nov 19 18:24:32 2007 +++ lutinutil/src/java/org/codelutin/util/StringUtil.java Wed Nov 28 01:21:37 2007 @@ -22,9 +22,9 @@ * * @author POUSSIN Benjamin * Copyright Code Lutin - * @version $Revision: 1.21 $ + * @version $Revision: 1.22 $ * - * Mise a jour: $Date: 2007-11-19 18:24:32 $ + * Mise a jour: $Date: 2007-11-28 01:21:37 $ * par : $Author: tchemit $ */ package org.codelutin.util; @@ -99,7 +99,8 @@ } static public String substring(String s, int begin) { - String result = substring(s, begin, s.length()); + String result; + result = substring(s, begin, s.length()); return result; } @@ -114,7 +115,8 @@ end = begin; } - String result = s.substring(begin, end); + String result; + result = s.substring(begin, end); return result; } @@ -178,7 +180,7 @@ */ static public String[] split(String args, String separator) { //TODO test - return split(openingChars,closingChars,args,separator); + return split(openingChars, closingChars, args, separator); // if (args == null) { // return new String[0]; // } @@ -240,7 +242,8 @@ * @return array with length > 0 if listAsString != null or null */ static public String[] split(String stringList) { - String[] result = split(stringList, ","); + String[] result; + result = split(stringList, ","); return result; } @@ -471,19 +474,19 @@ return DateFormat.getDateInstance().parse(s); } - static final protected double[] timeFactors = { 1000000, 1000, 60, 60, 24 }; + static final protected double[] timeFactors = {1000000, 1000, 60, 60, 24}; - static final protected String[] timeUnites = { "ns", "ms", "s", "m", "h", - "d" }; + static final protected String[] timeUnites = {"ns", "ms", "s", "m", "h", + "d"}; static public String convertTime(long value) { return convert(value, timeFactors, timeUnites); } - static final protected double[] memoryFactors = { 1024, 1024, 1024, 1024 }; + static final protected double[] memoryFactors = {1024, 1024, 1024, 1024}; - static final protected String[] memoryUnites = { "o", "Ko", "Mo", "Go", - "To" }; + static final protected String[] memoryUnites = {"o", "Ko", "Mo", "Go", + "To"}; static public String convertMemory(long value) { return convert(value, memoryFactors, memoryUnites); @@ -498,7 +501,8 @@ } tmp *= sign; - String result = MessageFormat.format("{0,number,0.###}{1}", tmp, + String result; + result = MessageFormat.format("{0,number,0.###}{1}", tmp, unites[i]); return result; } @@ -510,7 +514,7 @@ sb.append('(').append(txt).append(')'); sb.append('*'); } else { - if (max == 1&& min==0) { + if (max == 1 && min == 0) { sb.append('[').append(txt).append(']'); } else { sb.append('(').append(txt).append(')'); @@ -571,4 +575,26 @@ } return opens.isEmpty(); } + + public static String convertToConstantName(String name) { + StringBuilder sb = new StringBuilder(); + for (int i = 0, j = name.length(); i < j; i++) { + char c = name.charAt(i); + if (Character.isDigit(c)) { + sb.append(c); + continue; + } + if (!Character.isLetter(c)) { + + continue; + } + if (Character.isUpperCase(c)) { + sb.append('_').append(c); + } else { + sb.append(Character.toUpperCase(c)); + } + } + String result = sb.toString(); + return result.startsWith("_")?result.substring(1):result; + } }