Index: lutinutil/src/java/org/codelutin/util/ArgumentsParserException.java diff -u lutinutil/src/java/org/codelutin/util/ArgumentsParserException.java:1.1 lutinutil/src/java/org/codelutin/util/ArgumentsParserException.java:1.2 --- lutinutil/src/java/org/codelutin/util/ArgumentsParserException.java:1.1 Thu Aug 28 18:38:48 2003 +++ lutinutil/src/java/org/codelutin/util/ArgumentsParserException.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2003/08/28 18:38:48 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -33,6 +33,9 @@ public class ArgumentsParserException extends Exception { // ArgumentsParserException + /** */ + private static final long serialVersionUID = 8265924907001359910L; + public ArgumentsParserException(String msg){ super(msg); } Index: lutinutil/src/java/org/codelutin/util/BoundedList.java diff -u lutinutil/src/java/org/codelutin/util/BoundedList.java:1.1 lutinutil/src/java/org/codelutin/util/BoundedList.java:1.2 --- lutinutil/src/java/org/codelutin/util/BoundedList.java:1.1 Fri Jun 10 12:41:34 2005 +++ lutinutil/src/java/org/codelutin/util/BoundedList.java Wed Jan 4 13:26:32 2006 @@ -24,7 +24,7 @@ * Created: 30 mai 2005 * * @author Arnaud Thimel -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ */ @@ -37,7 +37,10 @@ * ArrayList with minimum and maximum sizes. For each operation, the size is checked and the BoundedList to ensure that it is kept in the range. */ public class BoundedList extends ArrayList { - //By defaut, maxSize is set to -1 (infinite) + /** */ + private static final long serialVersionUID = -3211387041114409849L; + +//By defaut, maxSize is set to -1 (infinite) private int minSize = 0; private int maxSize = -1; Index: lutinutil/src/java/org/codelutin/util/BoundedListOutOfBoundsException.java diff -u lutinutil/src/java/org/codelutin/util/BoundedListOutOfBoundsException.java:1.1 lutinutil/src/java/org/codelutin/util/BoundedListOutOfBoundsException.java:1.2 --- lutinutil/src/java/org/codelutin/util/BoundedListOutOfBoundsException.java:1.1 Fri Jun 10 12:41:34 2005 +++ lutinutil/src/java/org/codelutin/util/BoundedListOutOfBoundsException.java Wed Jan 4 13:26:32 2006 @@ -24,7 +24,7 @@ * Created: 30 mai 2005 * * @author Arnaud Thimel -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ */ @@ -33,7 +33,10 @@ public class BoundedListOutOfBoundsException extends RuntimeException { - /** + /** */ + private static final long serialVersionUID = 7006384682459926080L; + +/** * */ public BoundedListOutOfBoundsException() { Index: lutinutil/src/java/org/codelutin/util/CallAnalyse.java diff -u lutinutil/src/java/org/codelutin/util/CallAnalyse.java:1.2 lutinutil/src/java/org/codelutin/util/CallAnalyse.java:1.3 --- lutinutil/src/java/org/codelutin/util/CallAnalyse.java:1.2 Tue Aug 30 13:23:12 2005 +++ lutinutil/src/java/org/codelutin/util/CallAnalyse.java Wed Jan 4 13:26:32 2006 @@ -23,16 +23,15 @@ * Created: 25 août 2005 14:09:22 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Last update: $Date: 2005/08/30 13:23:12 $ + * Last update: $Date: 2006/01/04 13:26:32 $ * by : $Author: bpoussin $ */ package org.codelutin.util; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.TreeMap; import org.apache.commons.collections.primitives.ArrayLongList; @@ -127,6 +126,8 @@ } static public class ThreadStatistics extends TreeMap{ + /** */ + private static final long serialVersionUID = -36051448464013504L; protected boolean activated = false; public boolean getActivated(){ return activated; Index: lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java diff -u lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java:1.6 lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java:1.7 --- lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java:1.6 Fri Jun 3 13:54:23 2005 +++ lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ * - * Mise a jour: $Date: 2005/06/03 13:54:23 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -47,6 +47,10 @@ * Si cette classe est la derniere classe a conserver l'objet categorie * alors la categorie est libere et ainsi que les listeners si c'etait aussi * leur derniers referencements +* +*

Si les categories sont representees par des Class, alors vous pouvez +* utiliser la hierachie de classe pour creer de facon automatique les pere +* * @see org.codelutin.util.ListenerSet */ public class CategorisedListenerSet { // CategorisedListenerSet @@ -63,13 +67,36 @@ */ protected WeakHashMap listeners = new WeakHashMap(); protected WeakHashMap categoryParent = new WeakHashMap(); + protected boolean isClassCategory = true; protected Class listenerClass = null; + /** + * Construit un CategorisedListenerSet qui accepte n'importe quel type + * de listener et dont le isClassCategory est activé + * + */ public CategorisedListenerSet(){} + /** + * Construit un CategorisedListenerSet qui accepte les listeners + * dont le type est passé en parametre et dont le isClassCategory est activé + */ public CategorisedListenerSet(Class listenerClass){ this.listenerClass = listenerClass; } + /** + * + * @param listenerClass la classe dont doit heriter les listeners pour + * etre accepté lors de l'ajout + * @param isClassCategory si vrai et que les categorie passé en arguement + * lors de l'ajout sont de type Class alors lors du fire on recherche aussi + * les peres dans la hierarchie d'heritage de la classe (Super class et + * interfaces) + */ + public CategorisedListenerSet(Class listenerClass, boolean isClassCategory) { + this(listenerClass); + this.isClassCategory = isClassCategory; + } protected void checkCategory(Object category){ @@ -167,8 +194,11 @@ } }else{ Object parentCategory = category; - while(parentCategory != null){ + while(parentCategory != null){ result.addAll(getListeners(parentCategory)); + if (isClassCategory && parentCategory instanceof Class) { + result.addAll(getListenersClass((Class)parentCategory)); + } parentCategory = categoryParent.get(parentCategory); } } @@ -176,6 +206,18 @@ return result; } + protected ListenerSet getListenersClass(Class category) { + ListenerSet result = new ListenerSet(listenerClass); + Class superClass = category.getSuperclass(); + if (superClass != null) { + result.addAll(getAllListeners(superClass)); + } + for (Class c : category.getInterfaces()){ + result.addAll(getAllListeners(c)); + } + return result; + } + /** * Retourne un ListenerSet contenant seulement les listener de la categorie * demandé. Si la categorie n'existe pas alors elle est créé. Index: lutinutil/src/java/org/codelutin/util/FileUtil.java diff -u lutinutil/src/java/org/codelutin/util/FileUtil.java:1.2 lutinutil/src/java/org/codelutin/util/FileUtil.java:1.3 --- lutinutil/src/java/org/codelutin/util/FileUtil.java:1.2 Fri Jun 3 13:54:23 2005 +++ lutinutil/src/java/org/codelutin/util/FileUtil.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * Created: 22 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2005/06/03 13:54:23 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -40,6 +40,50 @@ public class FileUtil { // FileUtil + /** + * Equivalent de la methode basename unix. + * basename("/tmp/toto.xml", ".xml") -> "toto" + * + * @param file le fichier dont on souhaite le nom sans le chemin + * @param suffixes si present represente le suffixe a eliminer du fichier + * s'il est trouvé + * @return le nom du fichier sans le suffixe si trouvé. + */ + static public String basename(File file, String ... suffixes) { + String result = file.getName(); + for(String suffixe : suffixes) { + if (result.endsWith(suffixe)){ + result = result.substring(0, result.length() - suffixe.length()); + break; + } + } + return result; + } + + /** + * Permet de récupérer l'extension d'un fichier + * @param file le fichier dont on souhaite l'extension + * @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 + */ + static public String extension(File file, String ... extchars) { + String result = ""; + String name = file.getName(); + + if(extchars.length == 0) { + extchars = new String[]{"."}; + } + for (String extchar : extchars) { + int pos = name.lastIndexOf(extchar); + if (pos != -1) { + result = name.substring(pos + 1); + break; + } + } + return result; + } + static public interface FileAction { public boolean doAction(File f); } @@ -107,14 +151,14 @@ * être conservé dans les résultats. * @return une liste d'objet {@link java.io.File}, qui s'attisfont le filtre */ - public static List getFilteredElements(File directory, FileFilter ff) { - ArrayList result = new ArrayList(); - LinkedList todo = new LinkedList(); + public static List getFilteredElements(File directory, FileFilter ff) { + ArrayList result = new ArrayList(); + LinkedList todo = new LinkedList(); if (directory.isDirectory()){ todo.addAll(Arrays.asList(directory.listFiles())); } while(todo.size() > 0){ - File file = (File)todo.removeFirst(); + File file = todo.removeFirst(); if (file.isDirectory()){ todo.addAll(Arrays.asList(file.listFiles())); } Index: lutinutil/src/java/org/codelutin/util/FormatConverter.java diff -u lutinutil/src/java/org/codelutin/util/FormatConverter.java:1.2 lutinutil/src/java/org/codelutin/util/FormatConverter.java:1.3 --- lutinutil/src/java/org/codelutin/util/FormatConverter.java:1.2 Tue Dec 6 12:10:38 2005 +++ lutinutil/src/java/org/codelutin/util/FormatConverter.java Wed Jan 4 13:26:32 2006 @@ -23,15 +23,14 @@ * Created: 14 septembre 2005 00:55:19 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Last update: $Date: 2005/12/06 12:10:38 $ - * by : $Author: thimel $ + * Last update: $Date: 2006/01/04 13:26:32 $ + * by : $Author: bpoussin $ */ package org.codelutin.util; -import java.util.Map; import org.codelutin.util.FormatMap.Format; /** Index: lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java diff -u lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java:1.2 lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java:1.3 --- lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java:1.2 Tue Dec 6 12:10:17 2005 +++ lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java Wed Jan 4 13:26:32 2006 @@ -23,10 +23,10 @@ * Created: 14 septembre 2005 00:19:51 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Last update: $Date: 2005/12/06 12:10:17 $ - * by : $Author: thimel $ + * Last update: $Date: 2006/01/04 13:26:32 $ + * by : $Author: bpoussin $ */ package org.codelutin.util; @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; -import java.util.Map; + import org.apache.commons.collections.map.MultiKeyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Index: lutinutil/src/java/org/codelutin/util/FormatMap.java diff -u lutinutil/src/java/org/codelutin/util/FormatMap.java:1.2 lutinutil/src/java/org/codelutin/util/FormatMap.java:1.3 --- lutinutil/src/java/org/codelutin/util/FormatMap.java:1.2 Wed Sep 21 20:38:06 2005 +++ lutinutil/src/java/org/codelutin/util/FormatMap.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * Created: 16 septembre 2005 10:41:58 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Last update: $Date: 2005/09/21 20:38:06 $ + * Last update: $Date: 2006/01/04 13:26:32 $ * by : $Author: bpoussin $ */ @@ -33,9 +33,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.codelutin.util.FormatMap.Format; + /** * Classe servant de conteneur pour les différentes representation d'un objet * Les representations doivents être des instances de {@link #Format}. Le mieux @@ -67,9 +66,9 @@ */ public class FormatMap extends HashMap { // FormatMap - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(FormatMap.class); - + /** */ + private static final long serialVersionUID = -3386611811885092898L; + static public class Format { protected String name = null; public Format(String name) { Index: lutinutil/src/java/org/codelutin/util/GZUtilException.java diff -u lutinutil/src/java/org/codelutin/util/GZUtilException.java:1.1 lutinutil/src/java/org/codelutin/util/GZUtilException.java:1.2 --- lutinutil/src/java/org/codelutin/util/GZUtilException.java:1.1 Thu Nov 4 13:51:54 2004 +++ lutinutil/src/java/org/codelutin/util/GZUtilException.java Wed Jan 4 13:26:32 2006 @@ -23,15 +23,18 @@ * Created: 3 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/11/04 13:51:54 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ package org.codelutin.util; public class GZUtilException extends RuntimeException { // GZUtilException + /** */ + private static final long serialVersionUID = -3342417793974741697L; + public GZUtilException (String msg){ super(msg); } Index: lutinutil/src/java/org/codelutin/util/HashList.java diff -u lutinutil/src/java/org/codelutin/util/HashList.java:1.1 lutinutil/src/java/org/codelutin/util/HashList.java:1.2 --- lutinutil/src/java/org/codelutin/util/HashList.java:1.1 Thu Nov 4 13:51:54 2004 +++ lutinutil/src/java/org/codelutin/util/HashList.java Wed Jan 4 13:26:32 2006 @@ -23,14 +23,14 @@ * Created: 2 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/11/04 13:51:54 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ package org.codelutin.util; -import java.util.AbstractList; + import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -50,6 +50,9 @@ */ public class HashList extends ArrayList { // HashList + /** */ + private static final long serialVersionUID = -334941610313293930L; + protected HashSet set = new HashSet(); public HashList(){ Index: lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java diff -u lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java:1.7 lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java:1.8 --- lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java:1.7 Thu Nov 17 19:09:54 2005 +++ lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * Created: 2 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Mise a jour: $Date: 2005/11/17 19:09:54 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -52,6 +52,9 @@ */ public class HashMapMultiKey extends HashMap { // HashMapMultiKey + /** */ + private static final long serialVersionUID = 8455012633585431630L; + /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(HashMapMultiKey.class); @@ -313,6 +316,8 @@ } static public class Key implements Serializable { + /** */ + private static final long serialVersionUID = -2297846844678010597L; ArrayList keys = new ArrayList(); public Key add(Object o){ keys.add(o); Index: lutinutil/src/java/org/codelutin/util/ListenerSet.java diff -u lutinutil/src/java/org/codelutin/util/ListenerSet.java:1.6 lutinutil/src/java/org/codelutin/util/ListenerSet.java:1.7 --- lutinutil/src/java/org/codelutin/util/ListenerSet.java:1.6 Fri Jun 10 12:43:54 2005 +++ lutinutil/src/java/org/codelutin/util/ListenerSet.java Wed Jan 4 13:26:32 2006 @@ -22,16 +22,15 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ * - * Mise a jour: $Date: 2005/06/10 12:43:54 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ package org.codelutin.util; + import java.beans.Statement; import java.lang.ref.Reference; -import java.lang.ref.WeakReference; - import java.util.HashSet; import java.util.Iterator; @@ -87,6 +86,10 @@ this.listenerClass = listenerClass; } + public int size() { + return listeners.size(); + } + /** * Ajoute un listener dans la liste des listeners. * Index: lutinutil/src/java/org/codelutin/util/Log.java diff -u lutinutil/src/java/org/codelutin/util/Log.java:1.5 lutinutil/src/java/org/codelutin/util/Log.java:1.6 --- lutinutil/src/java/org/codelutin/util/Log.java:1.5 Fri Jun 3 13:54:23 2005 +++ lutinutil/src/java/org/codelutin/util/Log.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * Created: 12 août 2004 * * @author Benjamin Poussin - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * - * Mise a jour: $Date: 2005/06/03 13:54:23 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -80,6 +80,8 @@ * Les events envoyes aux listeners */ static public class LogEvent extends EventObject { + /** */ + private static final long serialVersionUID = 6597052732707368243L; protected String category; protected Level level; protected String message; @@ -133,6 +135,9 @@ * Le Level pour les log utilisateur */ static private class UserLevel extends Level { + /** */ + private static final long serialVersionUID = -9075227788352473733L; + public UserLevel(String name, int value){ super(name, value); } Index: lutinutil/src/java/org/codelutin/util/LoggingException.java diff -u lutinutil/src/java/org/codelutin/util/LoggingException.java:1.2 lutinutil/src/java/org/codelutin/util/LoggingException.java:1.3 --- lutinutil/src/java/org/codelutin/util/LoggingException.java:1.2 Mon Aug 16 15:01:33 2004 +++ lutinutil/src/java/org/codelutin/util/LoggingException.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * * @author POUSSIN Benjamin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/08/16 15:01:33 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -33,6 +33,9 @@ public class LoggingException extends RuntimeException { // LogException + /** */ + private static final long serialVersionUID = 3495450140612716283L; + public LoggingException(String msg) { super(msg); } Index: lutinutil/src/java/org/codelutin/util/RecursiveProperties.java diff -u lutinutil/src/java/org/codelutin/util/RecursiveProperties.java:1.2 lutinutil/src/java/org/codelutin/util/RecursiveProperties.java:1.3 --- lutinutil/src/java/org/codelutin/util/RecursiveProperties.java:1.2 Fri Jul 29 13:33:16 2005 +++ lutinutil/src/java/org/codelutin/util/RecursiveProperties.java Wed Jan 4 13:26:32 2006 @@ -23,10 +23,10 @@ * * @author Arnaud Thimel * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2005/07/29 13:33:16 $ - * par : $Author: thimel $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ + * par : $Author: bpoussin $ */ package org.codelutin.util; @@ -55,6 +55,9 @@ */ public class RecursiveProperties extends Properties { + /** */ + private static final long serialVersionUID = -5012939272780929116L; + public RecursiveProperties() { super(); } Index: lutinutil/src/java/org/codelutin/util/Resource.java diff -u lutinutil/src/java/org/codelutin/util/Resource.java:1.22 lutinutil/src/java/org/codelutin/util/Resource.java:1.23 --- lutinutil/src/java/org/codelutin/util/Resource.java:1.22 Wed Aug 3 15:56:07 2005 +++ lutinutil/src/java/org/codelutin/util/Resource.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * * @author POUSSIN Benjamin * Copyright Code Lutin -* @version $Revision: 1.22 $ +* @version $Revision: 1.23 $ * -* Mise a jour: $Date: 2005/08/03 15:56:07 $ +* Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -33,24 +33,21 @@ import java.io.File; import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; +import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.Properties; -import java.util.StringTokenizer; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; + import javax.swing.ImageIcon; -import java.util.logging.Level; -import java.util.logging.Logger; /** @@ -217,7 +214,7 @@ for(int i=0;i - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Mise a jour: $Date: 2004/11/08 13:39:19 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -33,6 +33,9 @@ public class ResourceException extends RuntimeException { // ResourceException + /** */ + private static final long serialVersionUID = -5490688835958083084L; + public ResourceException(String msg) { super(msg); } Index: lutinutil/src/java/org/codelutin/util/ResourceNotFoundException.java diff -u lutinutil/src/java/org/codelutin/util/ResourceNotFoundException.java:1.2 lutinutil/src/java/org/codelutin/util/ResourceNotFoundException.java:1.3 --- lutinutil/src/java/org/codelutin/util/ResourceNotFoundException.java:1.2 Mon Nov 8 13:39:19 2004 +++ lutinutil/src/java/org/codelutin/util/ResourceNotFoundException.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * * @author POUSSIN Benjamin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/11/08 13:39:19 $ + * Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ @@ -33,6 +33,9 @@ public class ResourceNotFoundException extends ResourceException { // ResourceNotFoundException + /** */ + private static final long serialVersionUID = 623160949107461992L; + public ResourceNotFoundException(String msg) { super(msg); } Index: lutinutil/src/java/org/codelutin/util/StringUtil.java diff -u lutinutil/src/java/org/codelutin/util/StringUtil.java:1.11 lutinutil/src/java/org/codelutin/util/StringUtil.java:1.12 --- lutinutil/src/java/org/codelutin/util/StringUtil.java:1.11 Thu Aug 25 21:16:51 2005 +++ lutinutil/src/java/org/codelutin/util/StringUtil.java Wed Jan 4 13:26:32 2006 @@ -22,9 +22,9 @@ * * @author POUSSIN Benjamin * Copyright Code Lutin -* @version $Revision: 1.11 $ +* @version $Revision: 1.12 $ * -* Mise a jour: $Date: 2005/08/25 21:16:51 $ +* Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ package org.codelutin.util; @@ -49,6 +49,23 @@ /** Constructor for the StringUtil object */ protected StringUtil() { } + + static public String substring(String s, int begin) { + String result = result = substring(s, begin, s.length()); + return result; + } + + static public String substring(String s, int begin, int end) { + if (begin < 0) { + begin = s.length() + begin; + } + if (end < 0) { + end = s.length() + end; + } + + String result = s.substring(begin, end); + return result; + } /** * Met en majuscule le premier caract?re de la cha?ne pass? en param?tre Index: lutinutil/src/java/org/codelutin/util/StringUtilException.java diff -u lutinutil/src/java/org/codelutin/util/StringUtilException.java:1.1 lutinutil/src/java/org/codelutin/util/StringUtilException.java:1.2 --- lutinutil/src/java/org/codelutin/util/StringUtilException.java:1.1 Mon Dec 13 14:03:50 2004 +++ lutinutil/src/java/org/codelutin/util/StringUtilException.java Wed Jan 4 13:26:32 2006 @@ -14,7 +14,10 @@ */ public class StringUtilException extends RuntimeException { - public StringUtilException(String message, Exception e) { + /** */ + private static final long serialVersionUID = 6148795384335489591L; + + public StringUtilException(String message, Exception e) { super(message, e); } Index: lutinutil/src/java/org/codelutin/util/TransformedList.java diff -u lutinutil/src/java/org/codelutin/util/TransformedList.java:1.2 lutinutil/src/java/org/codelutin/util/TransformedList.java:1.3 --- lutinutil/src/java/org/codelutin/util/TransformedList.java:1.2 Wed Aug 3 15:59:23 2005 +++ lutinutil/src/java/org/codelutin/util/TransformedList.java Wed Jan 4 13:26:32 2006 @@ -23,9 +23,9 @@ * Created: 2 août 2005 02:12:42 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Last update: $Date: 2005/08/03 15:59:23 $ + * Last update: $Date: 2006/01/04 13:26:32 $ * by : $Author: bpoussin $ */ @@ -39,15 +39,13 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; public class TransformedList extends AbstractList implements Serializable { // TransformedList // private static final long serialVersionUID = ; - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TransformedList.class); + /** */ + private static final long serialVersionUID = 2354881761407900789L; protected Transformer transformer = null; protected List inner = null; Index: lutinutil/src/java/org/codelutin/util/TransparenteSoftReference.java diff -u lutinutil/src/java/org/codelutin/util/TransparenteSoftReference.java:1.3 lutinutil/src/java/org/codelutin/util/TransparenteSoftReference.java:1.4 --- lutinutil/src/java/org/codelutin/util/TransparenteSoftReference.java:1.3 Thu Oct 27 16:28:00 2005 +++ lutinutil/src/java/org/codelutin/util/TransparenteSoftReference.java Wed Jan 4 13:26:32 2006 @@ -22,25 +22,22 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.3 $ +* @version $Revision: 1.4 $ * -* Mise a jour: $Date: 2005/10/27 16:28:00 $ +* Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ package org.codelutin.util; -import java.beans.Statement; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; -import java.util.HashSet; -import java.util.Iterator; /** * Cette classe etant SoftReference et surcharge les méthodes equals et * hashCode pour que ces méthodes retournes les mêmes résultat que les objets * contenu. */ -public class TransparenteSoftReference extends SoftReference { +public class TransparenteSoftReference extends SoftReference { protected int hash = 0; protected String toString = null; @@ -50,12 +47,12 @@ * * @param o DOCUMENTME Description of the Parameter */ - public TransparenteSoftReference(Object o) { + public TransparenteSoftReference(T o) { super(o); init(o); } - public TransparenteSoftReference(Object o, ReferenceQueue queue) { + public TransparenteSoftReference(T o, ReferenceQueue queue) { super(o, queue); init(o); } @@ -64,7 +61,7 @@ * On conserve le hash pour que la Reference puisse encore se faire * passer pour l'objet alors que celui-ci a disparu de la memoire */ - protected void init(Object o){ + protected void init(T o){ hash = o.hashCode(); toString = o.toString(); if(toString == null) { Index: lutinutil/src/java/org/codelutin/util/TransparenteWeakReference.java diff -u lutinutil/src/java/org/codelutin/util/TransparenteWeakReference.java:1.4 lutinutil/src/java/org/codelutin/util/TransparenteWeakReference.java:1.5 --- lutinutil/src/java/org/codelutin/util/TransparenteWeakReference.java:1.4 Fri Nov 11 03:16:59 2005 +++ lutinutil/src/java/org/codelutin/util/TransparenteWeakReference.java Wed Jan 4 13:26:32 2006 @@ -22,25 +22,22 @@ * * @author Benjamin Poussin * Copyright Code Lutin -* @version $Revision: 1.4 $ +* @version $Revision: 1.5 $ * -* Mise a jour: $Date: 2005/11/11 03:16:59 $ +* Mise a jour: $Date: 2006/01/04 13:26:32 $ * par : $Author: bpoussin $ */ package org.codelutin.util; -import java.beans.Statement; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import java.util.HashSet; -import java.util.Iterator; /** * Cette classe etant WeakReference et surcharge les méthodes equals et * hashCode pour que ces méthodes retournes les mêmes résultat que les objets * contenu. */ -public class TransparenteWeakReference extends WeakReference { +public class TransparenteWeakReference extends WeakReference { protected int hash = 0; protected String toString = null; @@ -50,12 +47,12 @@ * * @param o DOCUMENTME Description of the Parameter */ - public TransparenteWeakReference(Object o) { + public TransparenteWeakReference(T o) { super(o); init(o); } - public TransparenteWeakReference(Object o, ReferenceQueue queue) { + public TransparenteWeakReference(T o, ReferenceQueue queue) { super(o, queue); init(o); } @@ -64,7 +61,7 @@ * On conserve le hash pour que la Reference puisse encore se faire * passer pour l'objet alors que celui-ci a disparu de la memoire */ - protected void init(Object o){ + protected void init(T o){ hash = o.hashCode(); toString = o.toString(); if(toString == null) { @@ -99,11 +96,6 @@ (other != null && other.equals(local)); } - /** - * DOCUMENTME Method - * - * @return DOCUMENTME Description of the Return Value - */ public int hashCode() { return hash; }