Index: lutinutil/src/java/org/codelutin/util/ArgumentsParser.java diff -u lutinutil/src/java/org/codelutin/util/ArgumentsParser.java:1.6 lutinutil/src/java/org/codelutin/util/ArgumentsParser.java:1.7 --- lutinutil/src/java/org/codelutin/util/ArgumentsParser.java:1.6 Wed Dec 27 15:56:44 2006 +++ lutinutil/src/java/org/codelutin/util/ArgumentsParser.java Wed Apr 25 13:42:43 2007 @@ -24,9 +24,9 @@ * Created: 22 août 2003 * * @author Benjamin Poussin -* @version $Revision: 1.6 $ +* @version $Revision: 1.7 $ * -* Mise a jour: $Date: 2006/12/27 15:56:44 $ +* Mise a jour: $Date: 2007/04/25 13:42:43 $ * par : $Author: bpoussin $ */ @@ -35,7 +35,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; /** * Parser d'option de la ligne de commande. @@ -43,6 +42,7 @@ * et mettre des methodes pour récupérer directement ce type. */ public class ArgumentsParser extends java.lang.Object { + /** La liste des arguments qui ne sont pas des options */ protected ArrayList arguments = new ArrayList(); /** le nom à afficher pour l'usage */ Index: lutinutil/src/java/org/codelutin/util/ArrayUtil.java diff -u lutinutil/src/java/org/codelutin/util/ArrayUtil.java:1.7 lutinutil/src/java/org/codelutin/util/ArrayUtil.java:1.8 --- lutinutil/src/java/org/codelutin/util/ArrayUtil.java:1.7 Fri Jan 13 16:54:17 2006 +++ lutinutil/src/java/org/codelutin/util/ArrayUtil.java Wed Apr 25 13:42:43 2007 @@ -23,9 +23,9 @@ * Created: 31 oct. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Mise a jour: $Date: 2006/01/13 16:54:17 $ + * Mise a jour: $Date: 2007/04/25 13:42:43 $ * par : $Author: bpoussin $ */ @@ -42,15 +42,15 @@ * Permet de convertir un tableau en une liste, le type primitif * est encapsulé dans un objet. */ - static public List asList(double [] a){ - ArrayList result = new ArrayList(a.length); + static public List asList(double [] a){ + ArrayList result = new ArrayList(a.length); for(int i=0; i List asList(T [] a){ return Arrays.asList(a); } @@ -58,8 +58,8 @@ * Permet de convertir un tableau en une liste, le type primitif * est encapsulé dans un objet. */ - static public List asList(int [] a){ - ArrayList result = new ArrayList(a.length); + static public List asList(int [] a){ + ArrayList result = new ArrayList(a.length); for(int i=0; i clazz = null; int length = 0; for(Object[] tab:tabs){ if(tab != null){ length += tab.length; - Class tmp = tab.getClass().getComponentType(); + Class tmp = tab.getClass().getComponentType(); if(clazz == null){ clazz = tmp; } else if(tmp.isAssignableFrom(clazz)){ @@ -156,7 +156,8 @@ * @param elems les elemements a ajouter * @return un nouveau tableau contenant a la fin les elements souhaites */ - static public E [] concatElems(E [] tab, E ... elems) { + @SuppressWarnings("unchecked") + static public E [] concatElems(E [] tab, F ... elems) { E [] result = (E[])concat(tab, elems); return result; } Index: lutinutil/src/java/org/codelutin/util/BoundedList.java diff -u lutinutil/src/java/org/codelutin/util/BoundedList.java:1.2 lutinutil/src/java/org/codelutin/util/BoundedList.java:1.3 --- lutinutil/src/java/org/codelutin/util/BoundedList.java:1.2 Wed Jan 4 13:26:32 2006 +++ lutinutil/src/java/org/codelutin/util/BoundedList.java Wed Apr 25 13:42:43 2007 @@ -24,7 +24,7 @@ * Created: 30 mai 2005 * * @author Arnaud Thimel -* @version $Revision: 1.2 $ +* @version $Revision: 1.3 $ */ @@ -36,7 +36,7 @@ /** * 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 { +public class BoundedList extends ArrayList { /** */ private static final long serialVersionUID = -3211387041114409849L; @@ -79,7 +79,7 @@ * Creates a new BoundedList with the specified collection of elements. The min size is set to 0 and the max size to the infinite. * @param arg0 */ - public BoundedList(Collection arg0) { + public BoundedList(Collection arg0) { super(arg0); } @@ -100,7 +100,8 @@ * Appends the specified element to the end of this list. * @param o the Object to be added */ - public boolean add(Object o) { + @Override + public boolean add(E o) { if (checkNewSize(1)) return super.add(o); else @@ -112,7 +113,8 @@ * @param index the position where to add the Object * @param o the Object to be added */ - public void add(int index, Object o) { + @Override + public void add(int index, E o) { if (checkNewSize(1)) super.add(index, o); else @@ -123,7 +125,8 @@ * Appends all of the elements in the specified Collection to the end of this list, in the order that they are returned by the specified Collection's Iterator. * @param c the collection of Objects to be added */ - public boolean addAll(Collection c) { + @Override + public boolean addAll(Collection c) { if (checkNewSize(c.size())) return super.addAll(c); else @@ -135,7 +138,8 @@ * @param index the index where to start adding the collection of objects * @param c the collection of Objects to be added */ - public boolean addAll(int index, Collection c) { + @Override + public boolean addAll(int index, Collection c) { if (checkNewSize(c.size())) return super.addAll(index, c); else @@ -145,8 +149,10 @@ /** * Returns a shallow copy of this BoundedList instance */ + @SuppressWarnings("unchecked") + @Override public Object clone() { - BoundedList bL = (BoundedList)super.clone(); + BoundedList bL = (BoundedList)super.clone(); bL.minSize = minSize; bL.maxSize = maxSize; return bL; @@ -163,7 +169,8 @@ * Removes the element at the specified position in this list. * @param index the position of the element to be removed */ - public Object remove(int index) { + @Override + public E remove(int index) { if (checkNewSize(-1)) return super.remove(index); else @@ -175,6 +182,7 @@ * @param fromIndex index of first element to be removed * @param toIndex index after last element to be removed */ + @Override protected void removeRange(int fromIndex, int toIndex) { if (checkNewSize(-(toIndex - fromIndex))) super.removeRange(fromIndex, toIndex); @@ -185,6 +193,7 @@ /** * Removes a single instance of the specified element from this list, if it is present (optional operation). */ + @Override public boolean remove(Object o) { if (checkNewSize(-1) || !contains(o)) return super.remove(o); @@ -195,7 +204,8 @@ /** * Removes from this collection all of its elements that are contained in the specified collection (optional operation). */ - public boolean removeAll(Collection c) { + @Override + public boolean removeAll(Collection c) { //On ne sait pas si les éléments de la Collection sont contenus dans la liste. //De plus, on ne sait pas si les instances sont présentes un ou plusieurs fois (Si elles y sont +sieurs fois elles sont supprimées +sieurs fois) if (checkNewSize(-c.size())) @@ -216,6 +226,7 @@ return new BoundedListOutOfBoundsException(msg); } + @Override public String toString() { return /*"(" + minSize + ", " + maxSize + ") " +*/ super.toString(); } Index: lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java diff -u lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java:1.9 lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java:1.10 --- lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java:1.9 Mon Sep 18 10:02:09 2006 +++ lutinutil/src/java/org/codelutin/util/CategorisedListenerSet.java Wed Apr 25 13:42:43 2007 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ * - * Mise a jour: $Date: 2006/09/18 10:02:09 $ + * Mise a jour: $Date: 2007/04/25 13:42:43 $ * par : $Author: bpoussin $ */ @@ -37,7 +37,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.log.LutinLogFactory; /** * Objet permettant de géré plusieurs liste de listener de facon simple. Index: lutinutil/src/java/org/codelutin/util/FileUtil.java diff -u lutinutil/src/java/org/codelutin/util/FileUtil.java:1.18 lutinutil/src/java/org/codelutin/util/FileUtil.java:1.19 --- lutinutil/src/java/org/codelutin/util/FileUtil.java:1.18 Thu Feb 8 11:47:23 2007 +++ lutinutil/src/java/org/codelutin/util/FileUtil.java Wed Apr 25 13:42:43 2007 @@ -23,9 +23,9 @@ * Created: 22 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.18 $ + * @version $Revision: 1.19 $ * - * Mise a jour: $Date: 2007/02/08 11:47:23 $ + * Mise a jour: $Date: 2007/04/25 13:42:43 $ * par : $Author: bpoussin $ */ @@ -251,6 +251,7 @@ static public BufferedReader getReader(File file, String encoding) throws IOException { FileInputStream inf = new FileInputStream(file); InputStreamReader in = new InputStreamReader(inf, encoding); +// FileReader in = new FileReader(file); BufferedReader result = new BufferedReader(in); return result; } @@ -278,10 +279,14 @@ static public BufferedWriter getWriter(File file, String encoding) throws IOException { FileOutputStream outf = new FileOutputStream(file); OutputStreamWriter out = new OutputStreamWriter(outf, encoding); +// FileWriter out = new FileWriter(file); BufferedWriter result = new BufferedWriter(out); return result; } + public static void main(String[] args) { + + } /** * Permet de creer un nouveu repertoire temporaire, l'effacement du Index: lutinutil/src/java/org/codelutin/util/FormatMap.java diff -u lutinutil/src/java/org/codelutin/util/FormatMap.java:1.3 lutinutil/src/java/org/codelutin/util/FormatMap.java:1.4 --- lutinutil/src/java/org/codelutin/util/FormatMap.java:1.3 Wed Jan 4 13:26:32 2006 +++ lutinutil/src/java/org/codelutin/util/FormatMap.java Wed Apr 25 13:42:43 2007 @@ -23,9 +23,9 @@ * Created: 16 septembre 2005 10:41:58 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * - * Last update: $Date: 2006/01/04 13:26:32 $ + * Last update: $Date: 2007/04/25 13:42:43 $ * by : $Author: bpoussin $ */ @@ -156,7 +156,7 @@ public Object unconvert(FormatConverterFactory factory, Format format, Object ... args){ Object result = null; - Map values = this; + Map values = this; if (!values.containsKey(format) && !values.containsKey(FormatConverter.FORMAT_JAVA)) { throw new IllegalArgumentException("Aucun valeur disponible"); Index: lutinutil/src/java/org/codelutin/util/HashList.java diff -u lutinutil/src/java/org/codelutin/util/HashList.java:1.2 lutinutil/src/java/org/codelutin/util/HashList.java:1.3 --- lutinutil/src/java/org/codelutin/util/HashList.java:1.2 Wed Jan 4 13:26:32 2006 +++ lutinutil/src/java/org/codelutin/util/HashList.java Wed Apr 25 13:42:43 2007 @@ -23,9 +23,9 @@ * Created: 2 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2006/01/04 13:26:32 $ + * Mise a jour: $Date: 2007/04/25 13:42:43 $ * par : $Author: bpoussin $ */ @@ -48,34 +48,37 @@ * garantie. Il faut donc surcharger readObject et writeObject pour conserver * le HashSet */ -public class HashList extends ArrayList { // HashList +public class HashList extends ArrayList { // HashList /** */ private static final long serialVersionUID = -334941610313293930L; - protected HashSet set = new HashSet(); + protected HashSet set = new HashSet(); public HashList(){ super(); } - public HashList(Collection c){ + public HashList(Collection c){ addAll(c); } public HashList(int initialCapacity){ super(initialCapacity); } - public Object set(int index, Object element) { + @Override + public E set(int index, E element) { throw new UnsupportedOperationException("You can't use set method in HashList"); } - public boolean add(Object o) { + @Override + public boolean add(E o) { boolean result = !contains(o); add(size(), o); return result; } - public void add(int index, Object element) { + @Override + public void add(int index, E element) { if(set.add(element)){ super.add(index, element); } @@ -85,19 +88,24 @@ * supprime l'element demandé. Si l'elment n'existe pas alors, null * est retrouné. */ - public Object remove(int index) { + @Override + public E remove(int index) { if(set.remove(get(index))){ return super.remove(index); } return null; } + + @Override public void clear() { set.clear(); super.clear(); } - public boolean addAll(Collection c) { + + @Override + public boolean addAll(Collection c) { boolean modified = false; - Iterator e = c.iterator(); + Iterator e = c.iterator(); while (e.hasNext()) { if(add(e.next())) modified = true; @@ -105,9 +113,11 @@ return modified; } - public boolean addAll(int index, Collection c) { + + @Override + public boolean addAll(int index, Collection c) { boolean modified = false; - Iterator e = c.iterator(); + Iterator e = c.iterator(); while (e.hasNext()) { add(index++, e.next()); modified = true; @@ -116,18 +126,21 @@ } + @Override protected void removeRange(int fromIndex, int toIndex) { for(int i=toIndex-1; i>=fromIndex; i--){ remove(i); } } + @Override public boolean contains(Object elem) { return set.contains(elem); } + @Override public Object clone() { - HashList result = new HashList(this); + HashList result = new HashList(this); return result; } Index: lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java diff -u lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java:1.10 lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java:1.11 --- lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java:1.10 Tue May 23 13:55:52 2006 +++ lutinutil/src/java/org/codelutin/util/HashMapMultiKey.java Wed Apr 25 13:42:43 2007 @@ -23,9 +23,9 @@ * Created: 2 nov. 2004 * * @author Benjamin Poussin - * @version $Revision: 1.10 $ + * @version $Revision: 1.11 $ * - * Mise a jour: $Date: 2006/05/23 13:55:52 $ + * Mise a jour: $Date: 2007/04/25 13:42:43 $ * par : $Author: bpoussin $ */ @@ -52,7 +52,7 @@ * fonctionner comme il faut, c-a-d qu'il retourne les references et non * les objets. Mais les methodes simples fonctionnent: put, remove, get, ... */ -public class HashMapMultiKey extends HashMap { // HashMapMultiKey +public class HashMapMultiKey extends HashMap { // HashMapMultiKey /** */ private static final long serialVersionUID = 8455012633585431630L; @@ -65,12 +65,12 @@ public static final Object WEAK = new Object(); /** key: un objet, value un Set de key pour la vrai hashmap */ - protected HashMap keys = new HashMap(); + protected HashMap> keys = new HashMap>(); /** key: la valeur, valeur: la cle. Permet de supprimer rapidement une * key lorsque la valeur disparait */ - protected Map valueToKey = new IdentityHashMap(); - protected ReferenceQueue refQueueKey = new ReferenceQueue(); - protected ReferenceQueue refQueueValue = new ReferenceQueue(); + protected Map valueToKey = new IdentityHashMap(); + protected ReferenceQueue