Index: lutinutil/src/java/org/codelutin/util/FileUtil.java diff -u lutinutil/src/java/org/codelutin/util/FileUtil.java:1.15 lutinutil/src/java/org/codelutin/util/FileUtil.java:1.16 --- lutinutil/src/java/org/codelutin/util/FileUtil.java:1.15 Fri Sep 1 13:11:02 2006 +++ lutinutil/src/java/org/codelutin/util/FileUtil.java Thu Oct 12 21:22:24 2006 @@ -23,9 +23,9 @@ * Created: 22 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.15 $ + * @version $Revision: 1.16 $ * - * Mise a jour: $Date: 2006/09/01 13:11:02 $ + * Mise a jour: $Date: 2006/10/12 21:22:24 $ * par : $Author: bpoussin $ */ @@ -351,6 +351,7 @@ * @param extchar la liste des caracteres pouvant former l'extension * dans l'ordre de preference. Si vide on utilise ".". * @return l'extension ou la chaine vide si le fichier n'a pas d'extension + * l'extension ne contient pas le chaine de delimitation */ static public String extension(File file, String ... extchars) { String result = ""; @@ -362,7 +363,7 @@ for (String extchar : extchars) { int pos = name.lastIndexOf(extchar); if (pos != -1) { - result = name.substring(pos + 1); + result = name.substring(pos + extchar.length()); break; } } Index: lutinutil/src/java/org/codelutin/util/Resource.java diff -u lutinutil/src/java/org/codelutin/util/Resource.java:1.27 lutinutil/src/java/org/codelutin/util/Resource.java:1.28 --- lutinutil/src/java/org/codelutin/util/Resource.java:1.27 Thu Oct 5 10:00:53 2006 +++ lutinutil/src/java/org/codelutin/util/Resource.java Thu Oct 12 21:22:24 2006 @@ -23,9 +23,9 @@ * * @author POUSSIN Benjamin * Copyright Code Lutin -* @version $Revision: 1.27 $ +* @version $Revision: 1.28 $ * -* Mise a jour: $Date: 2006/10/05 10:00:53 $ +* Mise a jour: $Date: 2006/10/12 21:22:24 $ * par : $Author: bpoussin $ */ @@ -258,8 +258,8 @@ static public List getURLsFromJar(File jarfile, String pattern) { try{ - if(log.isInfoEnabled()) { - log.info("search '" + pattern + "' in " + jarfile); + if(log.isTraceEnabled()) { + log.trace("search '" + pattern + "' in " + jarfile); } ArrayList result = new ArrayList(); @@ -286,8 +286,8 @@ result.add(url); } } - if(log.isInfoEnabled()) { - log.info("found with pattern '" + pattern + "' : " + result); + if(log.isTraceEnabled()) { + log.trace("found with pattern '" + pattern + "' : " + result); } return result; }catch(IOException eee){ @@ -311,8 +311,8 @@ */ static public List getURLsFromDirectory(File repository, String pattern) { try{ - if(log.isInfoEnabled()) { - log.info("search '" + pattern + "' in " + repository); + if(log.isTraceEnabled()) { + log.trace("search '" + pattern + "' in " + repository); } HashList urlList = new HashList(); @@ -342,8 +342,8 @@ } } } - if(log.isInfoEnabled()) { - log.info("found with pattern '" + pattern + "' : " + urlList); + if(log.isTraceEnabled()) { + log.trace("found with pattern '" + pattern + "' : " + urlList); } return urlList; }catch(MalformedURLException eee){