This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See http://git.nuiton.org/nuiton-utils.git commit 5dd42a84a6ff17c5b770e168bc4923789a14b6ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 13:01:42 2016 +0100 First pass to fix javadoc syntax (See #3797) --- src/main/java/org/nuiton/util/AliasMap.java | 14 +-- src/main/java/org/nuiton/util/ArrayUtil.java | 13 +- src/main/java/org/nuiton/util/BoundedList.java | 17 +-- .../util/BoundedListOutOfBoundsException.java | 4 +- src/main/java/org/nuiton/util/CallAnalyse.java | 56 +++++---- .../java/org/nuiton/util/CardinalityHelper.java | 34 ++--- .../org/nuiton/util/CategorisedListenerSet.java | 4 +- src/main/java/org/nuiton/util/ClassLoaderUtil.java | 6 +- src/main/java/org/nuiton/util/CollectionUtil.java | 41 +++--- src/main/java/org/nuiton/util/DateUtil.java | 3 +- src/main/java/org/nuiton/util/DesktopUtil.java | 8 +- src/main/java/org/nuiton/util/DigestGenerator.java | 4 +- .../nuiton/util/FasterCachedResourceResolver.java | 15 +-- src/main/java/org/nuiton/util/FileUtil.java | 50 ++++---- src/main/java/org/nuiton/util/GZUtil.java | 2 +- src/main/java/org/nuiton/util/GZUtilException.java | 2 +- src/main/java/org/nuiton/util/HashList.java | 4 +- src/main/java/org/nuiton/util/LRUMapMultiKey.java | 16 +-- src/main/java/org/nuiton/util/ListenerSet.java | 4 +- .../java/org/nuiton/util/LoggingException.java | 2 +- .../org/nuiton/util/LoggingPatternFormatter.java | 28 +++-- src/main/java/org/nuiton/util/MD5InputStream.java | 4 +- src/main/java/org/nuiton/util/MatrixMap.java | 140 ++++++++++----------- src/main/java/org/nuiton/util/MonthEnum.java | 2 +- src/main/java/org/nuiton/util/NumberUtil.java | 2 +- src/main/java/org/nuiton/util/ObjectUtil.java | 35 +++--- src/main/java/org/nuiton/util/PagerBean.java | 4 +- src/main/java/org/nuiton/util/PagerBeanUtil.java | 6 +- src/main/java/org/nuiton/util/PeriodDates.java | 5 +- .../util/PropertiesDateRemoveFilterStream.java | 6 +- .../java/org/nuiton/util/RecursiveProperties.java | 6 +- src/main/java/org/nuiton/util/ReflectUtil.java | 33 +++-- src/main/java/org/nuiton/util/Resource.java | 38 +++--- .../java/org/nuiton/util/ResourceException.java | 2 +- .../org/nuiton/util/ResourceNotFoundException.java | 2 +- .../java/org/nuiton/util/ResourceResolver.java | 39 +++--- .../java/org/nuiton/util/ReverseFileReader.java | 3 +- src/main/java/org/nuiton/util/SemVer.java | 47 ++++--- .../java/org/nuiton/util/SortedProperties.java | 4 +- src/main/java/org/nuiton/util/StringUtil.java | 44 +++---- src/main/java/org/nuiton/util/TimeLog.java | 15 +-- .../org/nuiton/util/TransparenteSoftReference.java | 2 +- .../org/nuiton/util/TransparenteWeakReference.java | 4 +- src/main/java/org/nuiton/util/Version.java | 37 +++--- src/main/java/org/nuiton/util/VersionUtil.java | 50 ++++---- src/main/java/org/nuiton/util/ZipUtil.java | 43 ++++--- .../java/org/nuiton/util/beans/BeanMonitor.java | 18 +-- src/main/java/org/nuiton/util/beans/BeanUtil.java | 4 +- src/main/java/org/nuiton/util/beans/Binder.java | 26 ++-- .../java/org/nuiton/util/beans/BinderFactory.java | 28 ++--- .../org/nuiton/util/beans/BinderModelBuilder.java | 35 +++--- .../org/nuiton/util/beans/InstanceFactory.java | 4 +- .../java/org/nuiton/util/beans/PropertyDiff.java | 2 +- .../java/org/nuiton/util/beans/package-info.java | 14 +-- .../org/nuiton/util/converter/ColorConverter.java | 4 +- .../org/nuiton/util/converter/ConverterUtil.java | 10 +- .../org/nuiton/util/converter/EnumConverter.java | 6 +- .../org/nuiton/util/converter/FormatConverter.java | 14 +-- .../util/converter/FormatConverterFactory.java | 7 +- .../java/org/nuiton/util/converter/FormatMap.java | 11 +- .../nuiton/util/converter/KeyStrokeConverter.java | 5 +- .../org/nuiton/util/converter/URIConverter.java | 2 +- .../org/nuiton/util/converter/URLConverter.java | 2 +- .../nuiton/util/converter/VersionConverter.java | 2 +- .../org/nuiton/util/converter/package-info.java | 8 +- .../util/pagination/PaginationParameter.java | 14 +-- .../org/nuiton/util/rmi/RemoteMethodExecutor.java | 2 +- .../nuiton/util/rmi/RemoteMethodExecutorImpl.java | 2 +- .../org/nuiton/util/rmi/RemoteProxyFactory.java | 6 +- .../java/org/nuiton/util/rmi/ServiceExporter.java | 2 +- .../java/org/nuiton/util/rmi/package-info.java | 6 +- src/main/java/org/nuiton/util/version/SemVer.java | 60 +++++---- src/main/java/org/nuiton/util/version/Version.java | 34 ++--- .../org/nuiton/util/version/VersionBuilder.java | 4 +- .../org/nuiton/util/version/VersionComparator.java | 28 ++--- .../org/nuiton/util/version/VersionConverter.java | 2 +- .../java/org/nuiton/util/version/Versions.java | 20 +-- src/test/java/org/nuiton/util/AliasMapTest.java | 16 ++- src/test/java/org/nuiton/util/CallAnalyseTest.java | 20 ++- .../org/nuiton/util/CardinalityHelperTest.java | 2 +- .../nuiton/util/CategorisedListenerSetTest.java | 18 +-- .../java/org/nuiton/util/CollectionUtilTest.java | 2 +- src/test/java/org/nuiton/util/FileUtilTest.java | 16 ++- .../java/org/nuiton/util/LRUMapMultiKeyTest.java | 19 +-- src/test/java/org/nuiton/util/ListenerSetTest.java | 2 +- .../java/org/nuiton/util/MD5InputStreamTest.java | 2 +- src/test/java/org/nuiton/util/MatrixMapTest.java | 7 +- src/test/java/org/nuiton/util/NumberUtilTest.java | 2 +- src/test/java/org/nuiton/util/ObjectUtilTest.java | 44 +++---- .../java/org/nuiton/util/PagerBeanUtilTest.java | 2 +- .../org/nuiton/util/RecursivePropertiesTest.java | 11 +- src/test/java/org/nuiton/util/ReflectUtilTest.java | 2 +- src/test/java/org/nuiton/util/ResourceTest.java | 2 +- .../org/nuiton/util/ReverseFileReaderTest.java | 12 +- src/test/java/org/nuiton/util/SemVerTest.java | 28 ++--- src/test/java/org/nuiton/util/StringUtilTest.java | 14 +-- .../org/nuiton/util/TransparenteReferenceTest.java | 18 +-- src/test/java/org/nuiton/util/VersionTest.java | 11 +- src/test/java/org/nuiton/util/VersionUtilTest.java | 2 +- src/test/java/org/nuiton/util/ZipUtilTest.java | 26 ++-- src/test/java/org/nuiton/util/beans/BeanC.java | 2 +- .../org/nuiton/util/beans/BeanMonitorTest.java | 4 +- .../java/org/nuiton/util/beans/BeanUtilTest.java | 2 +- .../org/nuiton/util/beans/BinderFactoryTest.java | 2 +- .../nuiton/util/beans/BinderModelBuilderTest.java | 20 +-- .../java/org/nuiton/util/beans/BinderTest.java | 12 +- .../nuiton/util/converter/ConverterUtilTest.java | 2 +- .../util/converter/UnregistreableConverter.java | 2 +- .../util/converter/VersionConverterTest.java | 2 +- .../java/org/nuiton/util/rmi/AnyException.java | 2 +- .../nuiton/util/rmi/RmiExporterAndProxyTest.java | 3 +- src/test/java/org/nuiton/util/rmi/SomeBean.java | 2 +- src/test/java/org/nuiton/util/rmi/SomeService.java | 2 +- .../java/org/nuiton/util/rmi/SomeServiceImpl.java | 2 +- .../java/org/nuiton/util/version/SemVerTest.java | 24 ++-- .../resources/org/nuiton/util/fileUtilData.txt | 18 +-- 116 files changed, 784 insertions(+), 877 deletions(-) diff --git a/src/main/java/org/nuiton/util/AliasMap.java b/src/main/java/org/nuiton/util/AliasMap.java index a396278..b690dc1 100644 --- a/src/main/java/org/nuiton/util/AliasMap.java +++ b/src/main/java/org/nuiton/util/AliasMap.java @@ -23,16 +23,17 @@ package org.nuiton.util; */ +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.map.MultiValueMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.UUID; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.map.MultiValueMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Une map base sur une HashMap qui permet pour une valeur d'ajouter d'autres @@ -51,13 +52,12 @@ import org.apache.commons.logging.LogFactory; * Si la cle ne vous importe que peu, vous pouvez par exemple utiliser * {@link UUID#randomUUID()} pour generer une cle unique. * - * @author poussin - * @version $Revision$ + * @author Benjamin Poussin - poussin@codelutin.com * @since 3.6.9 */ public class AliasMap<K, V, A> extends HashMap<K, V> { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger. */ static private Log log = LogFactory.getLog(AliasMap.class); private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/nuiton/util/ArrayUtil.java b/src/main/java/org/nuiton/util/ArrayUtil.java index 2f310fa..3e9731d 100644 --- a/src/main/java/org/nuiton/util/ArrayUtil.java +++ b/src/main/java/org/nuiton/util/ArrayUtil.java @@ -21,16 +21,13 @@ */ -/* * +/** * ArrayUtil.java * * Created: 31 oct. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + */ package org.nuiton.util; @@ -89,12 +86,12 @@ public class ArrayUtil { // ArrayUtil /** * Retourne un nouveau tableau qui est la concatenation des deux autres. * Essai de garder pour le tableau resultat le type des tableaux en entré - * si possible. [Double], [Number] -> [Number]; [Double], [Long] -> [Object] + * si possible. [Double], [Number] → [Number]; [Double], [Long] → [Object] * * @param tabs les tableaux * @return le nouveau tableau ou null, si les deux tableaux sont null - * todo essayer de retourner le meilleur type de tableau possible - * [Double], [Long] -> [Number] + * todo essayer de retourner le meilleur type de tableau possible + * [Double], [Long] → [Number] */ public static Object[] concat(Object[]... tabs) { Object[] result = null; diff --git a/src/main/java/org/nuiton/util/BoundedList.java b/src/main/java/org/nuiton/util/BoundedList.java index 4366f29..929beb0 100644 --- a/src/main/java/org/nuiton/util/BoundedList.java +++ b/src/main/java/org/nuiton/util/BoundedList.java @@ -20,17 +20,6 @@ * #L% */ - -/* * -* BoundedList.java -* -* Created: 30 mai 2005 -* -* @author Arnaud Thimel <thimel@codelutin.com> -* @version $Revision$ -*/ - - package org.nuiton.util; import java.util.ArrayList; @@ -39,11 +28,11 @@ import java.util.Collection; /** * 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. - * <p/> + * * Created: 10 juin 2005 * - * @author athimel <thimel@codelutin.com> - * $Id$ + * @author Arnaud Thimel - thimel@codelutin.com + * */ public class BoundedList<E> extends ArrayList<E> { /** */ diff --git a/src/main/java/org/nuiton/util/BoundedListOutOfBoundsException.java b/src/main/java/org/nuiton/util/BoundedListOutOfBoundsException.java index 537c7a6..3743ba3 100644 --- a/src/main/java/org/nuiton/util/BoundedListOutOfBoundsException.java +++ b/src/main/java/org/nuiton/util/BoundedListOutOfBoundsException.java @@ -25,8 +25,8 @@ * * Created: 30 mai 2005 * -* @author Arnaud Thimel <thimel@codelutin.com> -* @version $Revision$ +* @author Arnaud Thimel - thimel@codelutin.com +* */ diff --git a/src/main/java/org/nuiton/util/CallAnalyse.java b/src/main/java/org/nuiton/util/CallAnalyse.java index 5fd4bad..2819fcd 100644 --- a/src/main/java/org/nuiton/util/CallAnalyse.java +++ b/src/main/java/org/nuiton/util/CallAnalyse.java @@ -20,18 +20,6 @@ * #L% */ - -/* * - * CallAnalyse.java - * - * Created: 25 ao�t 2005 14:09:22 CEST - * - * @author Benjamin POUSSIN <poussin@codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : */ - package org.nuiton.util; import org.apache.commons.collections.primitives.ArrayLongList; @@ -48,19 +36,25 @@ import java.util.TreeMap; * Cette classe permet de faire des analyses sur les appels de methode * En debut de methode on appelle la methode {@link #enter}, et en fin de methode * la methode {@link #exit}. - * <p/> + * <p> * Ensuite on peut récuperer les statistiques par Thread ou de tous les threads - * <p/> + * <p> * On a comme statistique + * <ul> * <li> le temps d'execution * <li> la memore utilisé * <li> le nombre d'appels + * </ul> * + * @author Benjamin Poussin - poussin@codelutin.com * @see TimeLog + * Created: 25 aout 2005 14:09:22 CEST */ public class CallAnalyse { // CallAnalyse - /** Logger. */ + /** + * Logger. + */ static private Log log = LogFactory.getLog(CallAnalyse.class); static private List<ThreadStatistics> listThreadStatistics = @@ -76,12 +70,16 @@ public class CallAnalyse { // CallAnalyse } }; - /** Permet d'activer les statistiques, pour le thread courant */ + /** + * Permet d'activer les statistiques, pour le thread courant + */ public static void activate() { stats.get().setActivated(true); } - /** Permet de desactiver les statistiques, pour le thread courant */ + /** + * Permet de desactiver les statistiques, pour le thread courant + */ public static void desactivate() { stats.get().setActivated(false); } @@ -94,7 +92,9 @@ public class CallAnalyse { // CallAnalyse return stats.get().getActivated(); } - /** @param name le nom de l'appel a monitorer */ + /** + * @param name le nom de l'appel a monitorer + */ public static void enter(String name) { ThreadStatistics t = stats.get(); if (t.getActivated()) { @@ -115,12 +115,16 @@ public class CallAnalyse { // CallAnalyse } } - /** @return the statistics for the current thread */ + /** + * @return the statistics for the current thread + */ public static ThreadStatistics getThreadStatistics() { return stats.get(); } - /** @return the statistics for all threads */ + /** + * @return the statistics for all threads + */ public static List<ThreadStatistics> getAllThreadStatistics() { return listThreadStatistics; } @@ -198,7 +202,9 @@ public class CallAnalyse { // CallAnalyse protected long sumMemory = 0; - /** pile contenant le temps de appel, util pour les appels recursifs */ + /** + * pile contenant le temps de appel, util pour les appels recursifs + */ protected ArrayLongList times = new ArrayLongList(); protected ArrayLongList memories = new ArrayLongList(); @@ -298,10 +304,10 @@ public class CallAnalyse { // CallAnalyse @Override public String toString() { return getName() + " calls=" + getCalls() - + " time=" + StringUtil.convertTime(getSumTime()) - + "(" + StringUtil.convertTime(getMinTime()) + "/" + StringUtil.convertTime(getAvgTime()) + "/" + StringUtil.convertTime(getMaxTime()) + ")" - + " memory=" + StringUtil.convertMemory(getSumMemory()) - + "(" + StringUtil.convertMemory(getMinMemory()) + "/" + StringUtil.convertMemory(getAvgMemory()) + "/" + StringUtil.convertMemory(getMaxMemory()) + ")" + + " time=" + StringUtil.convertTime(getSumTime()) + + "(" + StringUtil.convertTime(getMinTime()) + "/" + StringUtil.convertTime(getAvgTime()) + "/" + StringUtil.convertTime(getMaxTime()) + ")" + + " memory=" + StringUtil.convertMemory(getSumMemory()) + + "(" + StringUtil.convertMemory(getMinMemory()) + "/" + StringUtil.convertMemory(getAvgMemory()) + "/" + StringUtil.convertMemory(getMaxMemory()) + ")" ; } diff --git a/src/main/java/org/nuiton/util/CardinalityHelper.java b/src/main/java/org/nuiton/util/CardinalityHelper.java index ae6957c..9e71477 100644 --- a/src/main/java/org/nuiton/util/CardinalityHelper.java +++ b/src/main/java/org/nuiton/util/CardinalityHelper.java @@ -27,33 +27,33 @@ import java.util.regex.Pattern; /** * Une classe avec des méthodes utiles sur les cardinalités : - * <p/> + * * parser une cardinalité {@link #parseCardinalite(String, boolean)} - * <p/> + * * afficher une cardinité {@link #printCardinalite(StringBuilder, String, int, int, boolean, String, String, String, String)} - * <p/> + * * et pour tester des cardinalités : - * <p/> + * * {@link #isMandatory(int)}, savoir si une cardinalité est obligatoire à * partir de son min. - * <p/> + * * {@link #isRepetable(int)}, savoir si une cardinalité est répétable à partir * de son max. - * <p/> + * * {@link #isMaxBounded(int)}, savoir si une cardinalité est bornée sur son max * à partir de son max. - * <p/> + * * {@link #isDefaultMandatory(int, int)}, savoir si la cardinalité est la * cardinalité obligatoire par défaut {1}. - * <p/> + * * {@link #isDefaultOptional(int, int)}, savoir si la cardinalité est la * cardinalité optionel par défaut {0,1}. - * <p/> + * * {@link #isAvailable(int, int)}, savoir si il reste encore des occurrences * disponibles sur une cardianlité à partir d'un nombre d'oocurrence et du max * de la cardinalité. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class CardinalityHelper { @@ -75,7 +75,7 @@ public class CardinalityHelper { * * @param min le min de la cardinalité à tester * @param max le max de la cardinalité à tester - * @return <code>true</code> si min==1 et max=1 + * @return {@code true} si min==1 et max=1 */ public static boolean isDefaultMandatory(int min, int max) { return min == 1 && max == 1; @@ -86,7 +86,7 @@ public class CardinalityHelper { * * @param min le min de la cardinalité à tester * @param max le max de la cardinalité à tester - * @return <code>true</code> si min==0 && max==1 + * @return {@code true} si min==0 && max==1 */ public static boolean isDefaultOptional(int min, int max) { return min == 0 && max == 1; @@ -96,7 +96,7 @@ public class CardinalityHelper { * Indique si une cardinalité est obligatoire à partir de son min * * @param min le min de la cardinalité à tester - * @return <code>true</code> if min>0 + * @return {@code true} if min>0 */ public static boolean isMandatory(int min) { return min > 0; @@ -106,7 +106,7 @@ public class CardinalityHelper { * Indique si une cardinalité est majorée à partir de son max * * @param max le max de la cardinalité à tester - * @return <code>true</code> si max!=-1 + * @return {@code true} si max≠-1 */ public static boolean isMaxBounded(int max) { return max != -1; @@ -116,7 +116,7 @@ public class CardinalityHelper { * Indique si une cardinalité est répétable à partir de son max * * @param max le max de la cardinalité à tester - * @return <code>true</code> si max>0 || max==-1 + * @return {@code true} si max>0 || max==-1 */ public static boolean isRepetable(int max) { return !isMaxBounded(max) || max > 1; @@ -128,7 +128,7 @@ public class CardinalityHelper { * * @param current le nombre d'occurence actuel * @param max la borne max de la cardinalité - * @return <code>true</code> si la cardinalité n'a pas atteint sa borne max + * @return {@code true} si la cardinalité n'a pas atteint sa borne max */ public static boolean isAvailable(int current, int max) { @@ -140,7 +140,7 @@ public class CardinalityHelper { * obligatoire ou non. * * @param mandatory le critère à tester - * @return <code>1</code> si obligatoire, 0 sinon. + * @return {@code 1} si obligatoire, 0 sinon. */ public static int getDefaultMin(boolean mandatory) { return mandatory ? 1 : 0; diff --git a/src/main/java/org/nuiton/util/CategorisedListenerSet.java b/src/main/java/org/nuiton/util/CategorisedListenerSet.java index 3def6a5..0d5f13d 100644 --- a/src/main/java/org/nuiton/util/CategorisedListenerSet.java +++ b/src/main/java/org/nuiton/util/CategorisedListenerSet.java @@ -28,7 +28,7 @@ * * @author Benjamin Poussin <poussin@codelutin.com> * Copyright Code Lutin - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ @@ -54,7 +54,7 @@ import java.util.WeakHashMap; * 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 - * <p/> + * * <p> Si les categories sont representees par des Class, alors vous pouvez * utiliser la hierachie de classe pour creer de facon automatique les peres. * diff --git a/src/main/java/org/nuiton/util/ClassLoaderUtil.java b/src/main/java/org/nuiton/util/ClassLoaderUtil.java index 6d3b046..d305232 100644 --- a/src/main/java/org/nuiton/util/ClassLoaderUtil.java +++ b/src/main/java/org/nuiton/util/ClassLoaderUtil.java @@ -36,7 +36,7 @@ import java.util.Stack; /** * A usefull class with method for ClassLoader * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class ClassLoaderUtil { @@ -46,7 +46,7 @@ public class ClassLoaderUtil { /** * Returns the all urls to be used in a {@link URLClassLoader}. - * <p/> + * * If classloader has only one url and the url is a jar, try to load in * manifest class-path. * @@ -95,7 +95,7 @@ public class ClassLoaderUtil { /** * Recupere la liste des urls d'un {@link URLClassLoader}. - * <p/> + * * Note : Un cas particulier est positionné pour JBoss qui utilise * la method getAllURLs. * diff --git a/src/main/java/org/nuiton/util/CollectionUtil.java b/src/main/java/org/nuiton/util/CollectionUtil.java index cca8de9..7cf792e 100644 --- a/src/main/java/org/nuiton/util/CollectionUtil.java +++ b/src/main/java/org/nuiton/util/CollectionUtil.java @@ -20,17 +20,6 @@ * #L% */ -/* * - * CollectionUtil.java - * - * Created: 23 févr. 2006 09:03:39 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : */ - package org.nuiton.util; import java.util.Arrays; @@ -40,7 +29,11 @@ import java.util.List; import java.util.Set; -/** @author poussin */ +/** + * Created: 23 févr. 2006 09:03:39 + * + * @author Benjamin Poussin - poussin@codelutin.com + */ public class CollectionUtil { @@ -71,11 +64,11 @@ public class CollectionUtil { /** * Permet de convertir une liste non typée, en une liste typée. - * <p/> + * <p> * La liste en entrée en juste bien castée. - * <p/> + * <p> * On effectue une vérification sur le typage des élements de la liste. - * <p/> + * <p> * Note : <b>Aucune liste n'est créee, ni recopiée</b> * * @param list la liste à convertir @@ -94,7 +87,7 @@ public class CollectionUtil { if (!type.isAssignableFrom(o.getClass())) { throw new IllegalArgumentException( "can not cast List with object of type " + - o.getClass() + " to " + type + " type!"); + o.getClass() + " to " + type + " type!"); } } return (List<O>) list; @@ -102,11 +95,11 @@ public class CollectionUtil { /** * Permet de convertir une collection non typée, en une collection typée. - * <p/> + * <p> * La collection en entrée en juste bien castée. - * <p/> + * <p> * On effectue une vérification sur le typage des élements de la collection. - * <p/> + * <p> * Note : <b>Aucune collection n'est créee, ni recopiée</b> * * @param list la collection à convertir @@ -125,7 +118,7 @@ public class CollectionUtil { if (!type.isAssignableFrom(o.getClass())) { throw new IllegalArgumentException( "can not cast Collection with object of type " + - o.getClass() + " to " + type + " type!"); + o.getClass() + " to " + type + " type!"); } } return (Collection<O>) list; @@ -133,11 +126,11 @@ public class CollectionUtil { /** * Permet de convertir un ensemble non typée, en un ensemble typée. - * <p/> + * <p> * L'ensemble en entrée en juste bien castée. - * <p/> + * <p> * On effectue une vérification sur le typage des élements de la collection. - * <p/> + * <p> * Note : <b>Aucun ensemble n'est créee, ni recopiée</b> * * @param list l'ensemble à convertir @@ -156,7 +149,7 @@ public class CollectionUtil { if (!type.isAssignableFrom(o.getClass())) { throw new IllegalArgumentException( "can not cast Set with object of type " + - o.getClass() + " to " + type + " type!"); + o.getClass() + " to " + type + " type!"); } } return (Set<O>) list; diff --git a/src/main/java/org/nuiton/util/DateUtil.java b/src/main/java/org/nuiton/util/DateUtil.java index 9cc9026..860985d 100644 --- a/src/main/java/org/nuiton/util/DateUtil.java +++ b/src/main/java/org/nuiton/util/DateUtil.java @@ -32,11 +32,10 @@ import java.util.Locale; /** * Library for manipulating dates. - * <p/> + * * <b>Note: </b> * * @author fdesbois - * @version $Id$ * @since 1.4.1 */ public class DateUtil { diff --git a/src/main/java/org/nuiton/util/DesktopUtil.java b/src/main/java/org/nuiton/util/DesktopUtil.java index cc92c60..8634b64 100644 --- a/src/main/java/org/nuiton/util/DesktopUtil.java +++ b/src/main/java/org/nuiton/util/DesktopUtil.java @@ -32,7 +32,7 @@ import java.net.URI; /** * Utility class for methods to interact with Desktop Environment * - * @author jcouteau + * @author Jean Couteau - couteau@codelutin.com * @since 2.4.3 */ public class DesktopUtil { @@ -44,7 +44,7 @@ public class DesktopUtil { * Method to open an URI in the user default web browser. It uses the Java * Desktop API on Windows and Gnome environment and xdg-open on other * platforms (non-gnome linux distribution for example). - * <p/> + * * A Bug report have been opened in 2006 so that java.awt.Desktop can * support all environments but it is not fixed yet : * http://bugs.sun.com/view_bug.do?bug_id=6486393 this utility method should @@ -86,7 +86,7 @@ public class DesktopUtil { * Method to open an URI in the user default open client. It uses the Java * Desktop API on Windows and Gnome environment and xdg-open on other * platforms (non-gnome linux distribution for example). - * <p/> + * * A Bug report have been opened in 2006 so that java.awt.Desktop can * support all environments but it is not fixed yet : * http://bugs.sun.com/view_bug.do?bug_id=6486393 this utility method should @@ -131,7 +131,7 @@ public class DesktopUtil { * Method to open an URI in the user default mail client. It uses the Java * Desktop API on Windows and Gnome environment and xdg-email on other * platforms (non-gnome linux distribution for example). - * <p/> + * * A Bug report have been opened in 2006 so that java.awt.Desktop can * support all environments but it is not fixed yet : * http://bugs.sun.com/view_bug.do?bug_id=6486393 this utility method should diff --git a/src/main/java/org/nuiton/util/DigestGenerator.java b/src/main/java/org/nuiton/util/DigestGenerator.java index a92ada4..15f2eb6 100644 --- a/src/main/java/org/nuiton/util/DigestGenerator.java +++ b/src/main/java/org/nuiton/util/DigestGenerator.java @@ -1,7 +1,7 @@ /* * Nuiton Utils %%Ignore-License * - * $Id$ + * * $HeadURL$ * * Licensed to the Apache Software Foundation (ASF) under one @@ -54,7 +54,7 @@ import java.util.TreeMap; /** * Helper class to provide the functionality of the digest value generation. This is an implementation of the DHASH * algorithm on . - * <p/> + * * TODO tchemit 2010-08-25 : This class is a nightmare ? we talk about digest mixed with dom nodes ? * TODO tchemit 2010-08-25 : Should have more to explain the purpose (javadoc, author, since...) or (rename | split) this class. */ diff --git a/src/main/java/org/nuiton/util/FasterCachedResourceResolver.java b/src/main/java/org/nuiton/util/FasterCachedResourceResolver.java index 21f57be..ecd059d 100644 --- a/src/main/java/org/nuiton/util/FasterCachedResourceResolver.java +++ b/src/main/java/org/nuiton/util/FasterCachedResourceResolver.java @@ -30,16 +30,17 @@ import javax.xml.transform.stream.StreamSource; import java.net.URL; /** - * FasterCachedResourceResolver is a URIResolver using a optimized search time algorithm. <br/> + * FasterCachedResourceResolver is a URIResolver using a optimized search time algorithm. + * <p> * For a given href, will try to search the exact path in classp-ath in the exact directory META-INF/cache. - * <p/> + * </p> * The fact of using META-INF directory is optimized (special jvm directory). - * <p/> + * * The other fact of using an exact directory makes also decrease dramaticly time search. - * <p/> + * * Finally, we spend ten times less time in searching; moreover using the path of * searched resource resolve the probleme of name colision and this is also a good thing... - * <p/> + * * Exemple : * <pre> * href = http://foo/bar/file.txt @@ -47,10 +48,6 @@ import java.net.URL; * </pre> * * @author chorlet - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : */ public class FasterCachedResourceResolver extends ResourceResolver { diff --git a/src/main/java/org/nuiton/util/FileUtil.java b/src/main/java/org/nuiton/util/FileUtil.java index e430719..0221cba 100644 --- a/src/main/java/org/nuiton/util/FileUtil.java +++ b/src/main/java/org/nuiton/util/FileUtil.java @@ -66,11 +66,11 @@ import java.util.regex.Pattern; * temporaire, comparaison de dates de création, récupération d'une chaîne, * d'un Reader ou d'un Writer à partir d'un fichier, récupération du fichier * saisi dans une boîte de dialogue, conversions en byte[], en Stream... - * <p/> + * * Created: 22 novembre 2004 * - * @author bpoussin <poussin@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author Benjamin Poussin - poussin@codelutin.com + * @author Tony Chemit - chemit@codelutin.com */ public class FileUtil { // FileUtil @@ -557,7 +557,7 @@ public class FileUtil { // FileUtil /** * Equivalent de la methode basename unix. - * basename("/tmp/toto.xml", ".xml") -> "toto" + * 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 @@ -571,7 +571,7 @@ public class FileUtil { // FileUtil /** * Equivalent de la methode basename unix. - * basename("/tmp/toto.xml", ".xml") -> "toto" + * basename("/tmp/toto.xml", ".xml") → "toto" * * @param name le nom du fichier dont on souhaite le nom sans le chemin * @param suffixes si present represente le suffixe a eliminer du fichier @@ -850,7 +850,7 @@ public class FileUtil { // FileUtil /** * Copie recursivement le repertoire source dans le repertoire destination - * <p/> + * * copyRecursively("/truc/titi", "/var/tmp") donnera le repertoire * "/var/tmp/titi" * @@ -868,7 +868,7 @@ public class FileUtil { // FileUtil /** * Copie recursivement le repertoire source dans le repertoire destination - * <p/> + * * copyRecursively("/truc/titi", "/var/tmp", "bidulle") donnera le repertoire * "/var/tmp/bidulle", 'bidulle' remplacant 'titi' * @@ -897,7 +897,7 @@ public class FileUtil { // FileUtil /** * Copie recursivement le repertoire source dans le repertoire destination - * <p/> + * * copyRecursively("/truc/titi", "/var/tmp", "bidulle") donnera le repertoire * "/var/tmp/bidulle", 'bidulle' remplacant 'titi' * @@ -935,7 +935,7 @@ public class FileUtil { // FileUtil if (renameFrom != null && renameTo != null) { String tmp = path.replaceAll(renameFrom, renameTo); if (log.isDebugEnabled()) { - log.debug("rename " + path + " -> " + tmp); + log.debug("rename " + path + " → " + tmp); } path = tmp; } @@ -981,7 +981,7 @@ public class FileUtil { // FileUtil /** * @param file le fichier à tester. * @param includePatterns les patterns pour accepeter le fichier depuis son nom - * @return <code>true</code> si le fichier est accepté, <code>false> autrement. + * @return {@code true} si le fichier est accepté, <code>false> autrement. */ private static boolean copyRecursivelyAccept(File file, String[] includePatterns) { @@ -999,9 +999,9 @@ public class FileUtil { // FileUtil /** * Use the linePattern to break the given CharBuffer into lines, applying * the input pattern to each line to see if we have a match - * <p/> + * * Code taken from : - * <p/> + * * http://java.sun.com/javase/6/docs/technotes/guides/io/example/Grep.java * * @param regex regex to search into file @@ -1046,11 +1046,11 @@ public class FileUtil { // FileUtil /** * Java implementation for the unix grep command. - * <p/> + * * Code taken from : - * <p/> + * * http://java.sun.com/javase/6/docs/technotes/guides/io/example/Grep.java - * <p/> + * * May fail on windows with error : * The requested operation cannot be performed on a file with a user-mapped section open * @@ -1101,7 +1101,7 @@ public class FileUtil { // FileUtil /** * Java implementation for the unix grep command. - * <p/> + * * May fail on windows with error : * The requested operation cannot be performed on a file with a user-mapped section open * @@ -1131,7 +1131,7 @@ public class FileUtil { // FileUtil /** * Search for files matching regex in current directory. - * <p/> + * * May fail on windows with error : * The requested operation cannot be performed on a file with a user-mapped section open * @@ -1154,9 +1154,9 @@ public class FileUtil { // FileUtil /** * Sed implementation for a single file. - * <p/> + * * Oginal source code from http://kickjava.com/src/org/apache/lenya/util/SED.java.htm. - * <p/> + * * May fail on windows with error : * The requested operation cannot be performed on a file with a user-mapped section open * @@ -1208,7 +1208,7 @@ public class FileUtil { // FileUtil /** * Java implementation for the unix sed command. - * <p/> + * * May fail on windows with error : * The requested operation cannot be performed on a file with a user-mapped section open * @@ -1233,7 +1233,7 @@ public class FileUtil { // FileUtil /** * Java implementation for the unix sed command. - * <p/> + * * May fail on windows with error : * The requested operation cannot be performed on a file with a user-mapped section open * @@ -1271,7 +1271,7 @@ public class FileUtil { // FileUtil /** * Obtain a file from the given {@code rootDirectory}, applying given paths. - * <p/> + * * For example with paths = a, b and c, then result is : * <pre> * root/a/b/c @@ -1292,7 +1292,7 @@ public class FileUtil { // FileUtil /** * Obtain a file fro the given {@code rootDirectory}, applying the fqn. - * <p/> + * * For example with fqn = a.b.c, the result is : * <pre> * root/a/b/c @@ -1312,9 +1312,9 @@ public class FileUtil { // FileUtil /** * Obtain a directory and creates it if required to place some test data. - * <p/> + * * The directory will be : - * <p/> + * * <pre> * java.io.tmpdir/testclassName.fqn/methodName[/classifier]/timestamp * </pre> diff --git a/src/main/java/org/nuiton/util/GZUtil.java b/src/main/java/org/nuiton/util/GZUtil.java index a13fb79..a93d4ac 100644 --- a/src/main/java/org/nuiton/util/GZUtil.java +++ b/src/main/java/org/nuiton/util/GZUtil.java @@ -26,7 +26,7 @@ * Created: 3 nov. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ diff --git a/src/main/java/org/nuiton/util/GZUtilException.java b/src/main/java/org/nuiton/util/GZUtilException.java index 87fb3c7..0c0c0d3 100644 --- a/src/main/java/org/nuiton/util/GZUtilException.java +++ b/src/main/java/org/nuiton/util/GZUtilException.java @@ -26,7 +26,7 @@ * Created: 3 nov. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ diff --git a/src/main/java/org/nuiton/util/HashList.java b/src/main/java/org/nuiton/util/HashList.java index 74464fb..fe90d8e 100644 --- a/src/main/java/org/nuiton/util/HashList.java +++ b/src/main/java/org/nuiton/util/HashList.java @@ -26,7 +26,7 @@ * Created: 2 nov. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ @@ -43,7 +43,7 @@ import java.util.HashSet; * en premier que l'objet n'est pas deja dans la liste. S'il y est * alors il n'est pas ajouter, sinon il est ajouter. * L'utilisation de la methode set n'est pas permise - * <p/> + * * FIXME: la serialisation n'est pas modifier, c-a-d que seul le tableau est * conserve et pas la hashSet, donc apres recuperation, l'uticite n'est plus * garantie. Il faut donc surcharger readObject et writeObject pour conserver diff --git a/src/main/java/org/nuiton/util/LRUMapMultiKey.java b/src/main/java/org/nuiton/util/LRUMapMultiKey.java index 834247e..23943d6 100644 --- a/src/main/java/org/nuiton/util/LRUMapMultiKey.java +++ b/src/main/java/org/nuiton/util/LRUMapMultiKey.java @@ -20,17 +20,6 @@ * #L% */ -/* * - * LRUMapMultiKey.java - * - * Created: 23 mai 2006 04:08:03 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : */ - package org.nuiton.util; import org.apache.commons.logging.Log; @@ -46,7 +35,8 @@ import java.util.Map; import java.util.Set; -/** @author poussin */ +/** Created: 23 mai 2006 04:08:03 + * @author Benjamin Poussin - poussin@codelutin.com */ public class LRUMapMultiKey extends LinkedHashMap<LRUMapMultiKey.Key, Object> { @@ -54,7 +44,7 @@ public class LRUMapMultiKey extends LinkedHashMap<LRUMapMultiKey.Key, Object> { private static final Log log = LogFactory.getLog(LRUMapMultiKey.class); - /** @author poussin */ + /** @author Benjamin Poussin - poussin@codelutin.com */ public static class Key extends ArrayList<Object> { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/nuiton/util/ListenerSet.java b/src/main/java/org/nuiton/util/ListenerSet.java index c991afe..f703df2 100644 --- a/src/main/java/org/nuiton/util/ListenerSet.java +++ b/src/main/java/org/nuiton/util/ListenerSet.java @@ -27,7 +27,7 @@ * * @author Benjamin Poussin <poussin@codelutin.com> * Copyright Code Lutin - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ @@ -124,7 +124,7 @@ public class ListenerSet<L> implements Iterable<L> { // ListenerSet /** * Appele la méthode du listener sans argument. - * <p/> + * * Cette méthode echoue si la methode ou l'objet contenant la methode a * appeler n'est pas public. * diff --git a/src/main/java/org/nuiton/util/LoggingException.java b/src/main/java/org/nuiton/util/LoggingException.java index b244074..1877c7e 100644 --- a/src/main/java/org/nuiton/util/LoggingException.java +++ b/src/main/java/org/nuiton/util/LoggingException.java @@ -27,7 +27,7 @@ * * @author POUSSIN Benjamin <bpoussin@free.fr> * Copyright Code Lutin - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ diff --git a/src/main/java/org/nuiton/util/LoggingPatternFormatter.java b/src/main/java/org/nuiton/util/LoggingPatternFormatter.java index 8a80d94..2e76cb5 100644 --- a/src/main/java/org/nuiton/util/LoggingPatternFormatter.java +++ b/src/main/java/org/nuiton/util/LoggingPatternFormatter.java @@ -27,7 +27,7 @@ * * @author POUSSIN Benjamin <bpoussin@free.fr> * Copyright Code Lutin - * @version $Revision$ + * * * Mise a jour: $Date$ * par : $Author$ @@ -48,20 +48,21 @@ import java.util.logging.LogRecord; /** * Classe org.nuiton.logging.PatternFormatter. - * <p/> + * * <ul> * <li>n: new line</li> * <li>%: %</li> * <li>{: {</li> * </ul> - * <p/> + * * <ul> * <li>d: date</li> * </ul> - * <p/> + * * Date follow the same pattern as DateFormat. - * <p/> - * <ul> Sized + * + * Sized + * <ul> * <li>o: free memory</li> * <li>O: total memory</li> * <li>t: thread id</li> @@ -71,23 +72,24 @@ import java.util.logging.LogRecord; * <li>a: argument</li> * <li>e: exception</li> * </ul> - * <p/> + * * Sized element support justify pattern. - * {[+|-]<size>[:<maxPos>]}. + * {[+|-]<size>[:<maxPo>>]}. * '+' is * left justify, '-' rigth justify, size the prefered size for the element if it is not bigger. * If maxPos option is present blanc is not add if it go up to maxPos. - * <p/> - * <ul> SubString + * + * SubString + * <ul> * <li>M: method name</li> * </ul> - * <p/> + * * L'element SubString a les memes possibilites que le pattern justify, * et permet en plus de suprimer une sous chaine, * cela permet de supprimer le debut du nom d'une classe. * Syntaxe : - * {*<substring>|[+|-]<size>[:<maxPos>]} - * {<substring>*|[+|-]<size>[:<maxPos>]} + * {*<substring>|[+|-]<size>[:<maxPos>]} + * {<substring>*|[+|-]<size>[:<maxPos>]} * L'etoile represente le texte qui restera. */ public class LoggingPatternFormatter extends Formatter { // PatternFormatter diff --git a/src/main/java/org/nuiton/util/MD5InputStream.java b/src/main/java/org/nuiton/util/MD5InputStream.java index 7e5c776..e3e0752 100644 --- a/src/main/java/org/nuiton/util/MD5InputStream.java +++ b/src/main/java/org/nuiton/util/MD5InputStream.java @@ -41,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * MD5InputStream, a subclass of FilterInputStream implementing MD5 * functionality on a stream. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class MD5InputStream extends DigestInputStream { @@ -62,7 +62,7 @@ public class MD5InputStream extends DigestInputStream { /** * Compute the MD5 for the given {@code input}. - * <p/> + * * <b>Note:</b> The the stream will be closed after calling the method * even if something was wrong. * diff --git a/src/main/java/org/nuiton/util/MatrixMap.java b/src/main/java/org/nuiton/util/MatrixMap.java index 4907093..7c4af59 100644 --- a/src/main/java/org/nuiton/util/MatrixMap.java +++ b/src/main/java/org/nuiton/util/MatrixMap.java @@ -45,7 +45,7 @@ import java.util.RandomAccess; * Si lors de l'ajout on indique une dimension qui n'existe pas encore ou * un element dans une dimension qui n'existe pas, la matrice ajoute * automatiquement les elements manquant pour que l'ajout se passe bien. - * <p/> + * * MatrixMap permet de stocker les elements avec des cles de n'importe quel * type. Les coordonnees utilisant ces objets sont converti en coordonnees * numeriques qui est la seul chose que sait gere Matrix. Ces coordonnees @@ -53,21 +53,17 @@ import java.util.RandomAccess; * dans Vector. On decoupe ainsi les problemes et on minimise le stockage et * certain traitement sur les données puisqu'au final toutes les données sont * dans une simple liste. - * <p/> + * * Pour créer une nouvelle matrice, il faut utiliser une des méthodes de * {@link MatrixMap.Factory} * - * @author poussin - * @version $Revision$ + * @author Benjamin Poussin - poussin@codelutin.com * @since 2.2.1 - * <p/> - * Last update: $Date$ - * by : $Author$ */ public interface MatrixMap<E> extends Iterable<E> { /** Classe permettant la creation de matrice */ - public static class Factory { + class Factory { public static <T> MatrixMap<T> create(List... semantics) { MatrixMap<T> result = new MatrixMapFixed<T>(semantics); return result; @@ -113,7 +109,7 @@ public interface MatrixMap<E> extends Iterable<E> { } @Override - public MatrixMapIterator<E> iterator(); + MatrixMapIterator<E> iterator(); /** * Copy la matrice pour pouvoir la modifier sans perdre les donnees @@ -121,31 +117,31 @@ public interface MatrixMap<E> extends Iterable<E> { * * @return new matrix */ - public MatrixMap<E> copy(); + MatrixMap<E> copy(); - public SemanticList[] getSemantics(); + SemanticList[] getSemantics(); - public SemanticList getSemantic(int dim); + SemanticList getSemantic(int dim); - public void setSemantic(int dim, List sem); + void setSemantic(int dim, List sem); - public void setName(String name); + void setName(String name); - public String getName(); + String getName(); - public String[] getDimensionNames(); + String[] getDimensionNames(); - public void setDimensionNames(String[] names); + void setDimensionNames(String[] names); - public void setDimensionName(int dim, String name); + void setDimensionName(int dim, String name); - public String getDimensionName(int dim); + String getDimensionName(int dim); - public int getDimCount(); + int getDimCount(); - public int[] getDim(); + int[] getDim(); - public int getDim(int d); + int getDim(int d); /** * Applique sur chaque element de la matrice la fonction f @@ -154,7 +150,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @return Retourne la matrice elle meme. Les modifications sont faites directement * dessus */ - public MatrixMap<E> map(MapFunction<E> f); + MatrixMap<E> map(MapFunction<E> f); /** * Retourne l'element a une certaine position en utilisant des indices @@ -163,7 +159,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param coordinates * @return */ - public E getValueIndex(int... coordinates); + E getValueIndex(int... coordinates); /** * Modifie l'element a une certaine position en utilisant des indices @@ -172,7 +168,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param value la nouvelle valeur * @param coordinates */ - public void setValueIndex(E value, int... coordinates); + void setValueIndex(E value, int... coordinates); /** * Retourne l'element a une certaine position en utilisant les semantiques @@ -180,7 +176,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param coordinates * @return */ - public E getValue(Object... coordinates); + E getValue(Object... coordinates); /** * Modifie l'element a une certaine position en utilisant les semantiques @@ -188,7 +184,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param value la nouvelle valeur * @param coordinates */ - public void setValue(E value, Object... coordinates); + void setValue(E value, Object... coordinates); /** * Verifie que deux matrices sont completement equals @@ -197,7 +193,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param mat * @return */ - public boolean equals(MatrixMap mat); + boolean equals(MatrixMap mat); /** * Verifie si les matrices sont egales en ne regardant que les valeurs et @@ -206,14 +202,14 @@ public interface MatrixMap<E> extends Iterable<E> { * @param mat * @return equality on values */ - public boolean equalsValues(MatrixMap<E> mat); + boolean equalsValues(MatrixMap<E> mat); /** * Representation string de la matrice quelque soit le nombre de dimension * * @return */ - public String toStringGeneric(); + String toStringGeneric(); /** * Indique si les semantiques passées en argument sont valable pour la @@ -222,7 +218,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param semantics * @return */ - public boolean isValidCoordinates(Object[] semantics); + boolean isValidCoordinates(Object[] semantics); /** * Copie une matrice dans la matrice actuelle. La matrice à copier à le même @@ -232,7 +228,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param mat la matrice à copier * @return return la matrice courante. */ - public MatrixMap paste(MatrixMap<E> mat); + MatrixMap paste(MatrixMap<E> mat); /** * Permet de prendre une sous matrice dans la matrice courante. La sous @@ -241,7 +237,7 @@ public interface MatrixMap<E> extends Iterable<E> { * * @param dim la dimension dans lequel on veut une sous matrice * @param start la position dans dim d'ou il faut partir pour prendre la - * sous matrice. 0 <= start < dim.size si start est négatif alors + * sous matrice. 0 ≤ start < dim.size si start est négatif alors * la position de départ est calculé par rapport à la fin de la * dimension, pour avoir le dernier élément il faut passer -1 * @param nb le nombre d'élément à prendre dans la dimension si nb est @@ -249,7 +245,7 @@ public interface MatrixMap<E> extends Iterable<E> { * tous les éléments jusqu'à la fin de la dimension. * @return new matrix */ - public MatrixMap<E> getSubMatrix(int dim, Object start, int nb); + MatrixMap<E> getSubMatrix(int dim, Object start, int nb); /** * Permet de prendre une sous matrice dans la matrice courante. La sous @@ -260,18 +256,18 @@ public interface MatrixMap<E> extends Iterable<E> { * @param elem les éléments dans la dimension à conserver * @return new matrix */ - public MatrixMap<E> getSubMatrix(int dim, Object... elem); + MatrixMap<E> getSubMatrix(int dim, Object... elem); /** * Permet de prendre une sous matrice dans la matrice courante. - * <p/> + * * Réalise plusieurs appels à {@link #getSubMatrix(int, Object...)} suivant * l'implémentation. * * @param elems les éléments dans la dimension à conserver * @return new matrix */ - public MatrixMap<E> getSubMatrix(Object[]... elems); + MatrixMap<E> getSubMatrix(Object[]... elems); /** * Reduit la matrice de sorte que toutes les dimensions qui n'ont qu'un @@ -281,7 +277,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @return une nouvelle matrice plus petite que la matrice actuelle ou egal * s'il n'y a aucune dimension à supprimer */ - public MatrixMap<E> reduce(); + MatrixMap<E> reduce(); /** * Reduit le matrice seulement sur les dimensions passées en argument. Si @@ -291,7 +287,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param dims les dimensions sur lequel il faut faire la reduction * @return une nouvelle matrice */ - public MatrixMap<E> reduceDims(int... dims); + MatrixMap<E> reduceDims(int... dims); /** * Reduit la matrice de sorte que toutes les dimensions qui n'ont qu'un @@ -303,7 +299,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @return une nouvelle matrice plus petite que la matrice actuelle ou egal * s'il n'y a aucune dimension à supprimer */ - public MatrixMap<E> reduce(int minNbDim); + MatrixMap<E> reduce(int minNbDim); /** * Permet de retourner une nouvelle matrice ayant les semantiques passées @@ -313,7 +309,7 @@ public interface MatrixMap<E> extends Iterable<E> { * @param sems * @return */ - public MatrixMap<E> extend(Object... sems); + MatrixMap<E> extend(Object... sems); /////////////////////////////////////////////////////////////////////////// // @@ -325,7 +321,7 @@ public interface MatrixMap<E> extends Iterable<E> { * Classe contenant des méthodes statiques pour aider a la manipulation * des matrices */ - public static class MatrixHelper { + class MatrixHelper { /** * Mais en forme un texte pour qu'il fasse exactement la longueur @@ -435,17 +431,17 @@ public interface MatrixMap<E> extends Iterable<E> { * * @param <E> */ - public static interface MatrixMapIterator<E> extends Iterator<E> { - public int[] getCoordinates(); + interface MatrixMapIterator<E> extends Iterator<E> { + int[] getCoordinates(); - public E getValue(); + E getValue(); - public void setValue(E value); + void setValue(E value); - public Object[] getSemanticsCoordinates(); + Object[] getSemanticsCoordinates(); } - public static class MatrixMapIteratorImpl<E> implements MatrixMapIterator<E> { // MatrixMapIteratorImpl + class MatrixMapIteratorImpl<E> implements MatrixMapIterator<E> { // MatrixMapIteratorImpl protected MatrixIterator<E> iterator = null; @@ -505,13 +501,13 @@ public interface MatrixMap<E> extends Iterable<E> { /** * Collection particuliere utilisee pour la stockage des semantiques. - * <p/> + * * Sert a optimiser la recherche de la position d'une donnee dans la liste. * Permet aussi de verifier qu'on ajoute pas de doublon dans la liste * * @param <T> */ - public static class SemanticList<T> extends AbstractList<T> implements RandomAccess { + class SemanticList<T> extends AbstractList<T> implements RandomAccess { protected ArrayList<T> datas = null; @@ -593,22 +589,22 @@ public interface MatrixMap<E> extends Iterable<E> { * dimension qui n'existe pas, elle les ajoutes dans les semantiques. Ceci * n'est vrai que pour le set avec des semantiques, le set avec des indices * ne rend pas la matrice elastique. - * <p/> + * * Cette classe fonctionne avec une matrice interne que l'on change lorsque * l'on a besoin de modifier les dimensions. Le changement de dimension * a donc un cout (creation d'une nouvelle matrice, copie des elements) - * <p/> + * * Si on cree une sous matrice, et que l'on modifie la matrice mere * La sous matrice n'est pas impacter, puisqu'elle est base sur l'ancienne * represention interne de la matrice elastique, les deux matrices n'ont donc * plus de lien. - * <p/> + * * Les methodes reduce et extend retourne de nouvelle matrice qui ne sont * pas elastique. Si on veut qu'elle le soit, il faut les reencapsuler * * @param <E> */ - public static class MatrixMapElastic<E> implements MatrixMap<E> { + class MatrixMapElastic<E> implements MatrixMap<E> { protected MatrixMap<E> internalMatrixMap; @@ -776,8 +772,8 @@ public interface MatrixMap<E> extends Iterable<E> { * Implantation de MatrixMap dont les dimensions sont fixees a la creation * Les dimensions ne change plus par la suite */ - public static class MatrixMapFixed<E> extends AbstractMatrixMap<E> { - /** to use log facility, just put in your code: log.info(\"...\"); */ + class MatrixMapFixed<E> extends AbstractMatrixMap<E> { + /** Logger. */ static private Log log = LogFactory.getLog(MatrixMapFixed.class); protected Matrix<E> matrix = null; @@ -832,7 +828,7 @@ public interface MatrixMap<E> extends Iterable<E> { /** * Modifie un element de la matrice en fonction des dimensions passé en * paramètre.<br> - * <p/> + * * Exemple: Si on a un matrice 3D.<br> * m.set(v, [1,1,1]) modifie un element de la matrice.<br> * @@ -886,9 +882,9 @@ public interface MatrixMap<E> extends Iterable<E> { * * @param <E> */ - public static abstract class AbstractMatrixMap<E> implements MatrixMap<E> { + abstract class AbstractMatrixMap<E> implements MatrixMap<E> { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger. */ static private Log log = LogFactory.getLog(AbstractMatrixMap.class); protected String name = null; @@ -1137,7 +1133,7 @@ public interface MatrixMap<E> extends Iterable<E> { * v1, v2, v3 * ] * </pre> - * <p/> + * * Si la matrice est 2D * <pre> * MaMatrice(matrix2D) [ @@ -1148,7 +1144,7 @@ public interface MatrixMap<E> extends Iterable<E> { * DimC v7, v8, v9 * ] * </pre> - * <p/> + * * Pour les autres types de matrice la methode {@link #toStringGeneric() } * est utilise * @@ -1326,7 +1322,7 @@ public interface MatrixMap<E> extends Iterable<E> { * * @param dim la dimension dans lequel on veut une sous matrice * @param start la position dans dim d'ou il faut partir pour prendre la - * sous matrice. 0 <= start < dim.size si start est négatif alors + * sous matrice. 0 ≤ start < dim.size si start est négatif alors * la position de départ est calculé par rapport à la fin de la * dimension, pour avoir le dernier élément il faut passer -1 * @param nb le nombre d'élément à prendre dans la dimension si nb est @@ -1371,7 +1367,7 @@ public interface MatrixMap<E> extends Iterable<E> { /** * Permet de prendre une sous matrice dans la matrice courante. - * <p/> + * * Réalise plusieurs appels à {@link #getSubMatrix(int, Object...)} suivant * l'implémentation. * @@ -1411,7 +1407,7 @@ public interface MatrixMap<E> extends Iterable<E> { /** * Permet de prendre une sous matrice dans la matrice courante. - * <p/> + * * Réalise plusieurs appels a {@link #getSubMatrix(int, int[])} suivant * l'implementation. * @@ -1601,10 +1597,10 @@ public interface MatrixMap<E> extends Iterable<E> { * Pour l'instant une sous matrice a obligatoirement le meme nombre de dimension * que la matrice qu'elle contient. Elle permet juste de reduire le nombre * d'element d'une dimension. - * <p/> + * * C'est comme une "vue" réduite sur la vraie matrices. */ - public static class SubMatrix<E> extends AbstractMatrixMap<E> { // SubMatrix + class SubMatrix<E> extends AbstractMatrixMap<E> { // SubMatrix protected MatrixMap<E> matrix = null; @@ -1716,7 +1712,7 @@ public interface MatrixMap<E> extends Iterable<E> { * matrice avec la position reel de la matrice sous jacente. */ protected interface DimensionConverter extends Serializable { - public int[] convertCoordinates(int[] coordinates); + int[] convertCoordinates(int[] coordinates); } /** La conversion est juste un decalage d'indice */ @@ -1789,7 +1785,7 @@ public interface MatrixMap<E> extends Iterable<E> { * Objet matrice qui ne permet que le stockage avec des positions int * dans une matrice a autant de dimension que l'on souhaite. */ - public static class Matrix<E> implements Iterable<E> { // BasicMatrix + class Matrix<E> implements Iterable<E> { // BasicMatrix /** Les dimensions de la matrice */ protected int[] dimensions = null; @@ -2033,7 +2029,7 @@ public interface MatrixMap<E> extends Iterable<E> { } // BasicMatrix - public static class MatrixIterator<E> implements Iterator<E> { // MatrixIteratorImpl + class MatrixIterator<E> implements Iterator<E> { // MatrixIteratorImpl protected Matrix<E> matrix = null; @@ -2086,7 +2082,7 @@ public interface MatrixMap<E> extends Iterable<E> { * de ne conserver que les elements differents de la valeur par defaut, ce qui * minimize la taille du tableau necessaire a conserver les données. */ - public static class Vector<E> { // Vector + class Vector<E> { // Vector /** maximum number of element, maximum pos value */ protected int capacity = 0; @@ -2228,7 +2224,7 @@ public interface MatrixMap<E> extends Iterable<E> { * retourne la position dans le tableau position de la position lineaire * * @param pos - * @return la position ou < 0 donnant la position de l'element s'il etait + * @return la position ou < 0 donnant la position de l'element s'il etait * present */ protected int findIndex(int pos) { @@ -2306,7 +2302,7 @@ public interface MatrixMap<E> extends Iterable<E> { * Permet de faire un traitement sur des valeurs et d'en retourner * des nouvelles. */ - public static interface MapFunction<E> { // MapFunction + interface MapFunction<E> { // MapFunction /** * Permet de faire un traitement sur value et de retourne une nouvelle diff --git a/src/main/java/org/nuiton/util/MonthEnum.java b/src/main/java/org/nuiton/util/MonthEnum.java index 6da9346..13005d2 100644 --- a/src/main/java/org/nuiton/util/MonthEnum.java +++ b/src/main/java/org/nuiton/util/MonthEnum.java @@ -30,7 +30,7 @@ import static org.nuiton.i18n.I18n.t; /** * Une énumération pour représenter les mois d'une année. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public enum MonthEnum { diff --git a/src/main/java/org/nuiton/util/NumberUtil.java b/src/main/java/org/nuiton/util/NumberUtil.java index aabc905..5ea7e6c 100644 --- a/src/main/java/org/nuiton/util/NumberUtil.java +++ b/src/main/java/org/nuiton/util/NumberUtil.java @@ -31,7 +31,7 @@ import java.math.MathContext; import java.util.Arrays; /** - * @author kmorin <kmorin@codelutin.com> + * @author Kevin Morin - morin@codelutin.com * @since 3.0 */ public class NumberUtil { diff --git a/src/main/java/org/nuiton/util/ObjectUtil.java b/src/main/java/org/nuiton/util/ObjectUtil.java index 9d892d3..47ff77d 100644 --- a/src/main/java/org/nuiton/util/ObjectUtil.java +++ b/src/main/java/org/nuiton/util/ObjectUtil.java @@ -26,7 +26,7 @@ * Created: 2 nov. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ @@ -59,11 +59,11 @@ import static org.nuiton.i18n.I18n.t; * Outils pour manipuler des objets. Création d'un objet à partir d'une chaîne * le décrivant, conversion d'un objet en Object, récupération de méthodes * à partir de leur nom, de constructeurs à partir de leurs paramètres... - * <p/> + * * Created: 4 novembre 2004 * - * @author bpoussin <poussin@codelutin.com> - * $Id$ + * @author Benjamin Poussin - poussin@codelutin.com + * */ public class ObjectUtil { // ObjectUtil @@ -191,11 +191,12 @@ public class ObjectUtil { // ObjectUtil * Create new object from string like org.nuiton.Toto(name=machine, int=10) * where machine and int is properties on org.nuiton.Toto object. * Conversion between 10 in string and 10 as integer as automaticaly done - * <p/> - * For String property you can use ex: - * <li> name="my string with , in string" - * <li> name='my string with , in string' * + * For String property you can use ex: + * <ul> + * <li> name="my string with , in string"</li> + * <li> name='my string with , in string'</li> + * </ul> * @param classnameAndProperties * @return the instanciated object * @throws ClassNotFoundException @@ -259,7 +260,7 @@ public class ObjectUtil { // ObjectUtil /** * Clone object by introspection because Cloneable interface don't permit * to call clone :(. This methode replace next code that don't work :( - * <p/> + * * <pre> * if (o instanceof Cloneable) { * Object n = ((Cloneable)o).clone(); @@ -565,7 +566,7 @@ public class ObjectUtil { // ObjectUtil /** * Method toObject - * <p/> + * * transform a char to a Character Object * * @param c the char to transform @@ -579,7 +580,7 @@ public class ObjectUtil { // ObjectUtil /** * Method toObject - * <p/> + * * transform a byte to a Byte Object * * @param b the byte to transform @@ -593,7 +594,7 @@ public class ObjectUtil { // ObjectUtil /** * Method toObject - * <p/> + * * transform a short to a Short object * * @param s the short to transform @@ -607,7 +608,7 @@ public class ObjectUtil { // ObjectUtil /** * Method toObject - * <p/> + * * transform an int to an Integer object * * @param i the int to transform @@ -621,7 +622,7 @@ public class ObjectUtil { // ObjectUtil /** * Method toObject - * <p/> + * * transform a long to a Long object * * @param l the long to transform @@ -635,7 +636,7 @@ public class ObjectUtil { // ObjectUtil /** * Method toObject - * <p/> + * * transform a float to a Float Object * * @param f the float to transform @@ -649,7 +650,7 @@ public class ObjectUtil { // ObjectUtil /** * Method toObject - * <p/> + * * transform a double to a Double object * * @param d the double to transform @@ -663,7 +664,7 @@ public class ObjectUtil { // ObjectUtil /** * Method toObject - * <p/> + * * transform a boolean to a Boolean object * * @param b the boolean to transform diff --git a/src/main/java/org/nuiton/util/PagerBean.java b/src/main/java/org/nuiton/util/PagerBean.java index 9889c44..5d9374f 100644 --- a/src/main/java/org/nuiton/util/PagerBean.java +++ b/src/main/java/org/nuiton/util/PagerBean.java @@ -28,10 +28,10 @@ import java.io.Serializable; /** * A pager bean. - * <p/> + * * Was previously {@code org.nuiton.util.PagerUtil.PagerBean}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6.2 * @deprecated since 3.0, prefer using {@link org.nuiton.util.pagination.PaginationParameter}. */ diff --git a/src/main/java/org/nuiton/util/PagerBeanUtil.java b/src/main/java/org/nuiton/util/PagerBeanUtil.java index 48ed89b..8838717 100644 --- a/src/main/java/org/nuiton/util/PagerBeanUtil.java +++ b/src/main/java/org/nuiton/util/PagerBeanUtil.java @@ -29,10 +29,10 @@ import java.util.List; /** * Useful method around {@link PagerBean}. - * <p/> + * * Was previously {@code org.nuiton.util.PagerUtil}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6.2 */ public class PagerBeanUtil { @@ -81,7 +81,7 @@ public class PagerBeanUtil { /** * Get the elements of the lists using the pager datas: - * <p/> + * * <ul> * <li>{@code elements}:all elements of the pager</li> * <li>{@code pageSize}: number of elements in a page</li> diff --git a/src/main/java/org/nuiton/util/PeriodDates.java b/src/main/java/org/nuiton/util/PeriodDates.java index 2bba688..90bb7ad 100644 --- a/src/main/java/org/nuiton/util/PeriodDates.java +++ b/src/main/java/org/nuiton/util/PeriodDates.java @@ -31,11 +31,10 @@ import java.util.List; /** * TODO tchemit 2010-08-25 JAVADOC + I18N * PeriodDates.java - * <p/> + * * Created on 2009-08-13 * * @author fdesbois - * @version $Id$ */ public class PeriodDates implements Serializable { @@ -258,7 +257,7 @@ public class PeriodDates implements Serializable { public String toString() { String fromStr = DateUtil.formatDate(getFromDate(), pattern); String thruStr = DateUtil.formatDate(getThruDate(), pattern); - return "[ " + getFromDate() + " (pattern: " + fromStr + ") -> " + + return "[ " + getFromDate() + " (pattern: " + fromStr + ") → " + getThruDate() + " (pattern: " + thruStr + ") ]"; } diff --git a/src/main/java/org/nuiton/util/PropertiesDateRemoveFilterStream.java b/src/main/java/org/nuiton/util/PropertiesDateRemoveFilterStream.java index 745ab8b..0d772d2 100644 --- a/src/main/java/org/nuiton/util/PropertiesDateRemoveFilterStream.java +++ b/src/main/java/org/nuiton/util/PropertiesDateRemoveFilterStream.java @@ -29,14 +29,10 @@ import java.util.Properties; /** * Class used to not print first line into delegated {@link OutputStream}. - * <p/> + * * Used to remove first comment line writed by {@link Properties#store(OutputStream, String)}. * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ */ public class PropertiesDateRemoveFilterStream extends FilterOutputStream { diff --git a/src/main/java/org/nuiton/util/RecursiveProperties.java b/src/main/java/org/nuiton/util/RecursiveProperties.java index 383e1f6..18d18d8 100644 --- a/src/main/java/org/nuiton/util/RecursiveProperties.java +++ b/src/main/java/org/nuiton/util/RecursiveProperties.java @@ -28,7 +28,7 @@ import java.util.Properties; * Overrides {@link Properties} in order to check if the expected value * contains another property key like "${...}". It that case, the key * will be replaced by its value if possible. - * <p/> + * * Example : * <pre> * myFirstName=Arnaud @@ -38,7 +38,7 @@ import java.util.Properties; * namePhrase=My name is ${myName}. * instruction=Put your text like this : ${myText} * </pre> - * <p/> + * * Dans ce cas, * <ul> * <li>getProperty("org.nuiton.topia.userInfo.fullName") renverra "Arnaud Thimel" @@ -46,7 +46,7 @@ import java.util.Properties; * <li>getProperty("instruction") renverra "Put your text like this : ${myText}" * </ul> * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public class RecursiveProperties extends Properties { diff --git a/src/main/java/org/nuiton/util/ReflectUtil.java b/src/main/java/org/nuiton/util/ReflectUtil.java index 09eafc5..78b3501 100644 --- a/src/main/java/org/nuiton/util/ReflectUtil.java +++ b/src/main/java/org/nuiton/util/ReflectUtil.java @@ -43,11 +43,10 @@ import static org.nuiton.i18n.I18n.t; * Introspection sur une classe. Détermine si un attribut est constant, * recherche de constantes d'un type donné, conversion d'une classe en * Enum... - * <p/> + * * Created: 30 décembre 2007 * - * @author tchemit <chemit@codelutin.com> - * $Id$ + * @author Tony Chemit - chemit@codelutin.com */ public class ReflectUtil { @@ -60,7 +59,7 @@ public class ReflectUtil { * (modifiers sont static, final et public) * * @param field le champs à tester - * @return <code>true</code> si les modifiers sont final, static et public + * @return {@code true} si les modifiers sont final, static et public */ public static boolean isConstantField(Field field) { int modifiers = field.getModifiers(); @@ -70,9 +69,9 @@ public class ReflectUtil { } /** - * Recherche dans une classe donnée <code>klazz</code>, les constantes d'un - * certain type <code>searchingClass</code> et les retourne. - * <p/> + * Recherche dans une classe donnée {@code klazz}, les constantes d'un + * certain type {@code searchingClass} et les retourne. + * * L'algorithme parcourt aussi les superclasses. * * @param <T> enumeration's type @@ -186,7 +185,7 @@ public class ReflectUtil { /** * Obtain the boxed type of any incoming type. - * <p/> + * * If incoming type is not a primitive type, then just returns himself. * * @param type the type to box @@ -232,7 +231,7 @@ public class ReflectUtil { /** * Obtain the unboxed type of any incoming type. - * <p/> + * * If incoming type is a primitive type, then just returns himself. * * @param type the type to unbox @@ -279,7 +278,7 @@ public class ReflectUtil { /** * Obtain all the declared fields of the given {@code objectClass} with a * deep scan inside super classes and interfaces. - * <p/> + * * <strong>Note:</strong> The type {@link Object} will not be scanned. * * @param objectClass the object class to scan @@ -301,7 +300,7 @@ public class ReflectUtil { /** * Obtain all the declared methods of the given {@code objectClass} with a * deep scan inside super classes and interfaces. - * <p/> + * * <strong>Note:</strong> The type {@link Object} will not be scanned. * * @param objectClass the object class to scan @@ -322,7 +321,7 @@ public class ReflectUtil { /** * Obtain all the fields with the given annotation type. - * <p/> + * * <strong>Note:</strong> This method will not scan deeply the given type * (no scan of super-classes nor interfaces). * @@ -343,10 +342,10 @@ public class ReflectUtil { /** * Obtain all the fields with the given annotation type. - * <p/> + * * <strong>Note:</strong> This method will scan deeply the given type * if parameter {@code deepVisit} is setted to {@code true}. - * <p/> + * * <strong>Note:</strong> The type {@link Object} will not be scanned. * * @param objectClass the type to scan @@ -381,7 +380,7 @@ public class ReflectUtil { /** * Obtain all the methods with the given annotation type. - * <p/> + * * <strong>Note:</strong> This method will not scan deeply the given type * (no scan of super-classes nor interfaces). * @@ -402,10 +401,10 @@ public class ReflectUtil { /** * Obtain all the methods with the given annotation type. - * <p/> + * * <strong>Note:</strong> This method will scan deeply the given type * if parameter {@code deepVisit} is setted to {@code true}. - * <p/> + * * <strong>Note:</strong> The type {@link Object} will not be scanned. * * @param objectClass the type to scan diff --git a/src/main/java/org/nuiton/util/Resource.java b/src/main/java/org/nuiton/util/Resource.java index a5c3c98..ed5fd40 100644 --- a/src/main/java/org/nuiton/util/Resource.java +++ b/src/main/java/org/nuiton/util/Resource.java @@ -59,11 +59,11 @@ import static org.nuiton.i18n.I18n.t; * <pre> * URL image = Resource.getURL("/images/bidulle.png"); * </pre> - * <p/> + * * Created: 5 août 2003 * - * @author bpoussin <poussin@codelutin.com> - * $Id$ + * @author Benjamin Poussin - poussin@codelutin.com + * */ public class Resource { // Resource @@ -172,7 +172,7 @@ public class Resource { // Resource /** * Retourner la liste des fichiers du classLoader. Ces fichiers doivent * correspondre au pattern donne. - * <p/> + * * Utile par defaut {@link ClassLoader#getSystemClassLoader()}. * * @param pattern le nom du fichier a extraire du fichier compressé ou @@ -542,7 +542,7 @@ public class Resource { // Resource * * @param url the url to seek * @param directory the directory to find - * @return <code>true</code> if directory was found, <code>false</code> otherwise. + * @return {@code true} if directory was found, {@code false} otherwise. * @throws IOException if any io pb */ public static boolean containsDirectDirectory(URL url, String directory) throws IOException { @@ -593,11 +593,11 @@ public class Resource { // Resource /** * Find pattern resouces in {@link ClassLoader#getSystemClassLoader()}. - * <p/> + * * Usage : * <pre> - * List<URL> urls = Resources.getResources("META-INF/.*\\.MF"); - * List<URL> urls = Resources.getResources("org/nuiton/util/.?esource\\.class"); + * List<URL> urls = Resources.getResources("META-INF/.*\\.MF"); + * List<URL> urls = Resources.getResources("org/nuiton/util/.?esource\\.class"); * </pre> * * @param pattern java regex style pattern to find @@ -611,11 +611,11 @@ public class Resource { // Resource /** * Find pattern resouces in classloader. - * <p/> + * * Usage : * <pre> - * List<URL> urls = Resources.getResources("META-INF/.*\\.MF"); - * List<URL> urls = Resources.getResources("org/nuiton/util/.?esource\\.class"); + * List<URL> urls = Resources.getResources("META-INF/.*\\.MF"); + * List<URL> urls = Resources.getResources("org/nuiton/util/.?esource\\.class"); * </pre> * * @param pattern java regex style pattern to find @@ -663,8 +663,8 @@ public class Resource { // Resource // get root directory to get URL in classpath // for example : - // /WEB-INF/*.xml -> /WEB-INF/ - // /META-INF/persistence/*.xml -> /META-INF/persistence/ + // /WEB-INF/*.xml → /WEB-INF/ + // /META-INF/persistence/*.xml → /META-INF/persistence/ int prefixEnd = pattern.indexOf(":") + 1; int rootDirEnd = pattern.length(); while (rootDirEnd > prefixEnd && @@ -699,7 +699,7 @@ public class Resource { // Resource /** * Test if an url detnoe a jar file. - * <p/> + * * Code taken from spring source code : * org.springframework.core.io.support.PathMatchingResourcePatternResolver * @@ -717,7 +717,7 @@ public class Resource { // Resource /** * Find all resources in jar files that match the given location pattern * via the Java Regex style Matcher. - * <p/> + * * Code taken from spring source code : * org.springframework.core.io.support.PathMatchingResourcePatternResolver * @@ -746,7 +746,7 @@ public class Resource { // Resource JarEntry jarEntry = jarCon.getJarEntry(); rootEntryPath = jarEntry != null ? jarEntry.getName() : ""; } else { - // No JarURLConnection -> need to resort to URL file parsing. + // No JarURLConnection → need to resort to URL file parsing. // We'll assume URLs of the format "jar:path!/entry", with the protocol // being arbitrary as long as following the entry format. // We'll also handle paths with and without leading "file:" prefix. @@ -803,7 +803,7 @@ public class Resource { // Resource /** * Find all resources in the file system that match the given location pattern * via the Java style matcher. - * <p/> + * * Code taken from spring source code : * org.springframework.core.io.support.PathMatchingResourcePatternResolver * @@ -831,7 +831,7 @@ public class Resource { // Resource /** * Retrieve files that match the given path pattern, * checking the given directory and its subdirectories. - * <p/> + * * Code taken from spring source code : * org.springframework.core.io.support.PathMatchingResourcePatternResolver * @@ -868,7 +868,7 @@ public class Resource { // Resource /** * Recursively retrieve files that match the given pattern, * adding them to the given result list. - * <p/> + * * Code taken from spring source code : * org.springframework.core.io.support.PathMatchingResourcePatternResolver * diff --git a/src/main/java/org/nuiton/util/ResourceException.java b/src/main/java/org/nuiton/util/ResourceException.java index e2fbb00..e6b3702 100644 --- a/src/main/java/org/nuiton/util/ResourceException.java +++ b/src/main/java/org/nuiton/util/ResourceException.java @@ -26,7 +26,7 @@ * Created: 6 nov. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ diff --git a/src/main/java/org/nuiton/util/ResourceNotFoundException.java b/src/main/java/org/nuiton/util/ResourceNotFoundException.java index f0fcba6..d68fe4c 100644 --- a/src/main/java/org/nuiton/util/ResourceNotFoundException.java +++ b/src/main/java/org/nuiton/util/ResourceNotFoundException.java @@ -27,7 +27,7 @@ * * @author POUSSIN Benjamin <bpoussin@free.fr> * Copyright Code Lutin - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ diff --git a/src/main/java/org/nuiton/util/ResourceResolver.java b/src/main/java/org/nuiton/util/ResourceResolver.java index 2f56bd1..44a1936 100644 --- a/src/main/java/org/nuiton/util/ResourceResolver.java +++ b/src/main/java/org/nuiton/util/ResourceResolver.java @@ -41,30 +41,33 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * ResourceResolver is a URIResolver for XSL transformation. <br/> + * <p> + * ResourceResolver is a URIResolver for XSL transformation. + * </p> + * <p> * Its purpose is to catch the XSL document(...) function call and return a * valid data source only if the wanted resource is present in the project - * resources. <br/> - * The main goal of ResourceResolver is to retrieve datasources locally, if the + * resources. + * </p> + * <p>The main goal of ResourceResolver is to retrieve datasources locally, if the * wanted resource is not present in project resource then null will be - * returned.<br/> - * <p/> - * The resolve function search for the file part of href parameter: <br/> - * href: http://argouml.org/profiles/uml14/default-uml14.xmi <br/> - * file part: default-uml14.xmi. <br/> - * The resource is searched this way: <br/> - * eg: <code>[file part extension]/[file part]</code> <br/> - * eg: <code>xmi/default-uml14.xmi</code> - * <p/> + * returned. + * </p> + * The resolve function search for the file part of href parameter: + * <ul> + * <li>href: http://argouml.org/profiles/uml14/default-uml14.xmi</li> + * <li>file part: default-uml14.xmi.</li> + * </ul> + * The resource is searched this way: + * <ul> + * <li>eg: {@code [file part extension]/[file part]}</li> + * <li>eg: {@code xmi/default-uml14.xmi}</li> + * </ul> + * * You should assign this ResourceResolver on - * {@link Transformer} but not on - * {@link TransformerFactory}. <br/> + * {@link Transformer} but not on {@link TransformerFactory}. * * @author chorlet - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : */ public class ResourceResolver implements URIResolver { diff --git a/src/main/java/org/nuiton/util/ReverseFileReader.java b/src/main/java/org/nuiton/util/ReverseFileReader.java index 98f885b..6660598 100644 --- a/src/main/java/org/nuiton/util/ReverseFileReader.java +++ b/src/main/java/org/nuiton/util/ReverseFileReader.java @@ -29,11 +29,10 @@ import java.io.RandomAccessFile; /** * Reverse file reader. - * <p/> + * * Read file line by line for end of file to begin of file. * * @author chatellier - * @version $ID: $ */ public class ReverseFileReader implements Closeable { protected String filename; diff --git a/src/main/java/org/nuiton/util/SemVer.java b/src/main/java/org/nuiton/util/SemVer.java index 7bf55f6..5c8bdc1 100644 --- a/src/main/java/org/nuiton/util/SemVer.java +++ b/src/main/java/org/nuiton/util/SemVer.java @@ -23,13 +23,14 @@ package org.nuiton.util; */ -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * Implantation de http://semver.org/. * @@ -37,13 +38,16 @@ import org.apache.commons.logging.LogFactory; * pour modifier un de ses elements * * Quelques changement par rapport au site: + * <ul> * <li> le numero de version peut avoir entre 1 et N element, et non pas 3 obligatoirement * <li> on peut avoir un -SNAPSHOT ajoute en toute fin de la version + * </ul> * * Un SemVer est en plusieurs elements dont chaque element peut avoir plusieurs * composant. Les composants sont utilise le meme separateur '.'. * - * <li> version: 1 à N composant numerique, les 3 premiers sont nomme + * <ul> + * <li> version: 1 à N composant numerique, les 3 premiers sont nomme * <ul> * <li> major * <li> minor @@ -52,28 +56,27 @@ import org.apache.commons.logging.LogFactory; * <li> prerelease: 0 à N composant alphanumerique, le prefix est '-' * <li> build: 0 à N composant alphanumerique, le prefix est '+' * <li> SNAPSHOT: 0 ou 1 composant dont le nom est fixe le prefix est '-' + * </ul> + * Le mieux pour construire ou modifier un SemVer est d'utilise une methode creator: + * <ul> + * <li> SemVer.creator(1,2,3).done() → "1.2.3" + * <li> SemVer.creator("1.2.3","rc2").done() → "1.2.3-rc2" + * <li> SemVer.creator().setVersion(2.3.4).setBuild("r223").done() → "2.3.4+r223" + * <li> SemVer.creator().setVersion(2.3.4).setSnapshot(true).done() → "2.3.4-SNAPSHOT" + * <li> SemVer.creator(new SemVer("1.2.3")).incMajor().done() → "2.2.2" + * <li> new SemVer("1.2.3").getCreator().incMinor().setPrerelease(beta).done() → "1.3.3-beta" + * </ul> * - * Le mieux pour construire ou modifier un SemVer est d'utilise une methode - * creator: - * <li> SemVer.creator(1,2,3).done() => "1.2.3" - * <li> SemVer.creator("1.2.3","rc2").done() => "1.2.3-rc2" - * <li> SemVer.creator().setVersion(2.3.4).setBuild("r223").done() => "2.3.4+r223" - * <li> SemVer.creator().setVersion(2.3.4).setSnapshot(true).done() => "2.3.4-SNAPSHOT" - * <li> SemVer.creator(new SemVer("1.2.3")).incMajor().done() => "2.2.2" - * <li> new SemVer("1.2.3").getCreator().incMinor().setPrerelease(beta).done() => "1.3.3-beta" + * @author Benjamin Poussin - poussin@codelutin.com * - * @author poussin - * @version $Revision$ * - * Last update: $Date$ - * by : $Author$ * @since 2.6.7 * @deprecated since 3.0 (use now {@link org.nuiton.util.version.SemVer}). */ @Deprecated public class SemVer implements Comparable<SemVer> { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger. */ static private Log log = LogFactory.getLog(SemVer.class); /** Separateur utiliser entre chaque element d'une partie */ @@ -135,7 +138,7 @@ public class SemVer implements Comparable<SemVer> { /** * @param o the other version to test - * @return <code>true</code> if current version is before the given one + * @return {@code true} if current version is before the given one */ public boolean before(SemVer o) { int result = compareTo(o); @@ -144,7 +147,7 @@ public class SemVer implements Comparable<SemVer> { /** * @param o the other version to test - * @return <code>true</code> if current version is after the given one + * @return {@code true} if current version is after the given one */ public boolean after(SemVer o) { int result = compareTo(o); @@ -257,8 +260,10 @@ public class SemVer implements Comparable<SemVer> { /** * Donne le nombre de composante de l'element + * <ul> * <li>1.2.3 retourne 3 * <li>99.100 retourne 2 + * </ul> * * @return */ @@ -292,8 +297,10 @@ public class SemVer implements Comparable<SemVer> { /** * Donne le nombre de composante de la version + * <ul> * <li>1.2.3 retourne 3 * <li>99.100 retourne 2 + * </ul> * * @return */ @@ -333,8 +340,10 @@ public class SemVer implements Comparable<SemVer> { /** * Donne le nombre de composante de la Prerelease + * <ul> * <li>1.2.3 retourne 3 * <li>99.100 retourne 2 + * </ul> * * @return */ @@ -359,8 +368,10 @@ public class SemVer implements Comparable<SemVer> { /** * Donne le nombre de composante de la Prerelease + * <ul> * <li>1.2.3 retourne 3 * <li>99.100 retourne 2 + * </ul> * * @return */ diff --git a/src/main/java/org/nuiton/util/SortedProperties.java b/src/main/java/org/nuiton/util/SortedProperties.java index 2834db4..08c235e 100644 --- a/src/main/java/org/nuiton/util/SortedProperties.java +++ b/src/main/java/org/nuiton/util/SortedProperties.java @@ -31,8 +31,8 @@ import java.util.Vector; /** * Permet d'avoir les propriétés triées. * - * @author jruchaud <ruchaud@codelutin.com> - * $Id$ + * @author Julien Ruchaud - ruchaud@codelutin.com + * */ public class SortedProperties extends Properties { diff --git a/src/main/java/org/nuiton/util/StringUtil.java b/src/main/java/org/nuiton/util/StringUtil.java index 95e6a5d..458eebc 100644 --- a/src/main/java/org/nuiton/util/StringUtil.java +++ b/src/main/java/org/nuiton/util/StringUtil.java @@ -41,12 +41,12 @@ import java.util.Locale; * Classe contenant un ensemle de methode static utiles pour la manipulation des * chaine de caractere mais qui ne sont pas defini dans la classe String de * Java. - * <p/> + * * Created: 21 octobre 2003 * - * @author bpoussin <poussin@codelutin.com> - * @author tchemit <chemit@codelutin.com> - * $Id$ + * @author Benjamin Poussin - poussin@codelutin.com + * @author Tony Chemit - chemit@codelutin.com + * */ public class StringUtil { // StringUtil @@ -60,7 +60,7 @@ public class StringUtil { // StringUtil * Know if a string is a valid e-mail. * * @param str a string - * @return true if <code>str</code> is syntactically a valid e-mail address + * @return true if {@code str} is syntactically a valid e-mail address * @since 2.1 */ public static boolean isEmail(String str) { @@ -133,7 +133,7 @@ public class StringUtil { // StringUtil /** * Use {@link Object#toString()} method by default - * Must be @{@link Override} to use other methods to get string value. + * Must be override to use other methods to get string value. * * @param o to convert * @return String value @@ -214,12 +214,12 @@ public class StringUtil { // StringUtil /** * substring from begin to end of s - * <p/> + * * example: - * <li> substring("tatetitotu", -4) => totu + * substring("tatetitotu", -4) → totu * * @param s the string to substring - * @param begin if begin < 0 then begin start at end of string - begin + * @param begin if begin < 0 then begin start at end of string - begin * @return the result of substring */ public static String substring(String s, int begin) { @@ -229,9 +229,9 @@ public class StringUtil { // StringUtil /** * substring from begin to end of s - * <p/> + * * example: - * <li> substring("tatetitotu", -4, -2) => to + * substring("tatetitotu", -4, -2) → to * * @param s the string to substring * @param begin if begin < 0 then begin start at end of string - begin @@ -262,7 +262,7 @@ public class StringUtil { // StringUtil * Split string use 'separator' as separator. If String contains "'()[]{} * this method count the number of open char end close char to split * correctly argument - * <p/> + * * WARNING: cette method ne fonctionne pas si le contenu contient * des carateres utilisé pour le parsing et présent une seule fois. * Par exemple: "l'idenfiant" contient ' qui empeche totalement le @@ -280,14 +280,14 @@ public class StringUtil { // StringUtil /** * Use to split string array representation in array according with ',' as * default separator. - * <p/> + * * WARNING: cette method ne fonctionne pas si le contenu contient * des carateres utilisé pour le parsing et présent une seule fois. * Par exemple: "l'idenfiant" contient ' qui empeche totalement le * parsing de fonctionner. * * @param stringList string that represent array - * @return array with length > 0 if listAsString != null or null + * @return array with length > 0 if listAsString ≠ null or null */ public static String[] split(String stringList) { String[] result; @@ -297,11 +297,11 @@ public class StringUtil { // StringUtil /** * Split string use 'separator' as separator. If String contains "' - * and <code>openingChar</code> <code>closingChars</code> - * <p/> + * and {@code openingChar} {@code closingChars} + * * this method count the number of open char end close char to split * correctly argument - * <p/> + * * WARNING: cette method ne fonctionne pas si le contenu contient * des carateres utilisé pour le parsing et présent une seule fois. * Par exemple: "l'idenfiant" contient ' qui empeche totalement le @@ -620,17 +620,17 @@ public class StringUtil { // StringUtil /** * Vérifie q'une chaine de caractère est valid pour les bloc openner closer, ie. - * <p/> + * * que les blocs définit par les deux caractères s'entrechevauchent pas. - * <p/> + * * Exemple avec '(' ')' : - * <p/> + * * (a(b)) est valide, par contre ((aaa))) n'est pas valide * * @param txt txte a verifier * @param opener le caractère ouvrant * @param closer le caractère fermant - * @return <code>true</code> is la chaine est valide + * @return {@code true} is la chaine est valide */ public static boolean checkEnclosure(String txt, char opener, char closer) { if (txt.indexOf(opener) == -1 && txt.indexOf(closer) == -1) { @@ -659,7 +659,7 @@ public class StringUtil { // StringUtil /** * Convertir un nom en une constante Java - * <p/> + * * Les seuls caractères autorisés sont les alpha numériques, ains * que l'underscore. tous les autres caractères seront ignorés. * diff --git a/src/main/java/org/nuiton/util/TimeLog.java b/src/main/java/org/nuiton/util/TimeLog.java index ba4529b..758bf6d 100644 --- a/src/main/java/org/nuiton/util/TimeLog.java +++ b/src/main/java/org/nuiton/util/TimeLog.java @@ -29,7 +29,7 @@ import java.util.Map; /** * Cette classe permet de facilement trace le temps d'execution entre deux points - * <p/> + * * usage * <pre> * final static private Log log = LogFactory.getLog(MyClass.class); @@ -49,18 +49,15 @@ import java.util.Map; * * System.out.println ("time: " + timeLog.getCallCount()); * </pre> - * <p/> + * * You can configure log level in configuration file with: * log4j.logger.org.codelutin.MyClass=DEBUG * log4j.logger.org.codelutin.MyClass.TimeLog=INFO * - * @author poussin - * @version $Revision$ + * @author Benjamin Poussin - poussin@codelutin.com + * * @see CallAnalyse * @since 2.1 - * <p/> - * Last update: $Date$ - * by : $Author$ */ public class TimeLog { @@ -150,12 +147,12 @@ public class TimeLog { /** @param timeToLogInfoMs time in milliseconde after that we log info */ public void setTimeToLogInfo(long timeToLogInfoMs) { - timeToLogInfo = timeToLogInfoMs * 1000000l; // convert ms -> ns + timeToLogInfo = timeToLogInfoMs * 1000000l; // convert ms → ns } /** @param timeToLogWarnMs time in milliseconde after that we log warn */ public void setTimeToLogWarn(long timeToLogWarnMs) { - timeToLogWarn = timeToLogWarnMs * 1000000l; // convert ms -> ns + timeToLogWarn = timeToLogWarnMs * 1000000l; // convert ms → ns } public Map<String, CallStat> getCallCount() { diff --git a/src/main/java/org/nuiton/util/TransparenteSoftReference.java b/src/main/java/org/nuiton/util/TransparenteSoftReference.java index eace092..bd50c2d 100644 --- a/src/main/java/org/nuiton/util/TransparenteSoftReference.java +++ b/src/main/java/org/nuiton/util/TransparenteSoftReference.java @@ -27,7 +27,7 @@ * * @author Benjamin Poussin <poussin@codelutin.com> * Copyright Code Lutin -* @version $Revision$ +* * * Mise a jour: $Date$ * par : $Author$ diff --git a/src/main/java/org/nuiton/util/TransparenteWeakReference.java b/src/main/java/org/nuiton/util/TransparenteWeakReference.java index 356a5b2..7902fd1 100644 --- a/src/main/java/org/nuiton/util/TransparenteWeakReference.java +++ b/src/main/java/org/nuiton/util/TransparenteWeakReference.java @@ -27,7 +27,7 @@ * * @author Benjamin Poussin <poussin@codelutin.com> * Copyright Code Lutin - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ @@ -104,7 +104,7 @@ public class TransparenteWeakReference<T> extends WeakReference<T> { /** * @param o l'objet a comparer - * @return <code>true</code> si meme reference memoire on les objets + * @return {@code true} si meme reference memoire on les objets * references sont egaux */ @Override diff --git a/src/main/java/org/nuiton/util/Version.java b/src/main/java/org/nuiton/util/Version.java index 1fd18fd..a3aa90b 100644 --- a/src/main/java/org/nuiton/util/Version.java +++ b/src/main/java/org/nuiton/util/Version.java @@ -32,37 +32,36 @@ import static org.nuiton.i18n.I18n.t; /** * A class to represent an application version with possible classifier. - * <p/> + * * Replace previously org.nuiton.util.VersionNumber class. - * <p/> + * * Simple version number is defined like this : * <pre> * 1.0.0 or 1 * </pre> - * <p/> + * * A version can be more complex, with a classifier like this : * <pre> * 1.0.0-alpha-1, 1.0.0-beta-2, 1.0.0-rc-1 * </pre> - * <p/> + * * A classifier (alpha, beta, rc, ...) must be follwed by a classifier number. - * <p/> + * * Note : - * <p/> + * * - initial value is 0 - * <p/> + * * - the equals order is defined on {@link #getVersion()} property. - * <p/> + * * - the class is comparable, using the natural version order : - * <p/> - * <pre>0 < 0.1 < 1 < 1.0 < 1.1-alpha-0 < 1.1-alpha-1 < 1.1-beta-0 < - * 1.1-rc-1 < 1.1 </pre> - * <p/> + * + * <pre>0 <0.1 <1 <1.0 <1.1-alpha-0 <1.1-alpha-1 <1.1-beta-0 < 1.1-rc-1 <1.1 </pre> + * * - the class is immutable, you should not instanciate directly a Version, * but prefer use the factory static methods - * <code>VersionUtil.valueOf(...)</code> instead. + * {@code VersionUtil.valueOf(...)} instead. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1.0 * @deprecated since 3.0 (use now {@link org.nuiton.util.version.Version}). */ @@ -93,12 +92,12 @@ public class Version implements Comparable<Version>, Serializable { /** * A flag to attach or not the classifier with his number. - * <p/> + * * If set to false (the default cas then a - will be used to separe them). - * <p/> + * * Even if the {@link Version} class is immutable, this state can be change * since it is only used to build the string representation of a version. - * <p/> + * * Notes that this state is NOT used to test equality of two version, * neither for the comparaison. * @@ -319,7 +318,7 @@ public class Version implements Comparable<Version>, Serializable { /** * @param o the other version to test - * @return <code>true</code> if current version is before the given one + * @return {@code true} if current version is before the given one */ public boolean before(Version o) { int result = compareTo(o); @@ -328,7 +327,7 @@ public class Version implements Comparable<Version>, Serializable { /** * @param o the other version to test - * @return <code>true</code> if current version is after the given one + * @return {@code true} if current version is after the given one */ public boolean after(Version o) { int result = compareTo(o); diff --git a/src/main/java/org/nuiton/util/VersionUtil.java b/src/main/java/org/nuiton/util/VersionUtil.java index c579c1d..e829643 100644 --- a/src/main/java/org/nuiton/util/VersionUtil.java +++ b/src/main/java/org/nuiton/util/VersionUtil.java @@ -32,10 +32,10 @@ import java.util.regex.Pattern; /** * Class of usefull methods on {@link Version} objects. - * <p/> - * There is some factory methods : <code>valueOf(XXX)</code> to obtain a new + * + * There is some factory methods : {@code valueOf(XXX)} to obtain a new * version. - * <p/> + * * Some methods to transform a version (since version are immutable, we can not * modify Version's property) : * <pre> @@ -45,7 +45,7 @@ import java.util.regex.Pattern; * - removeClassifier(Version) : to remove a classifier from a version * </pre> * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1.0 * @deprecated since 3.0 (use now {@link org.nuiton.util.version.Version}). */ @@ -55,17 +55,17 @@ public class VersionUtil { /** * Pattern pour detecter une version (avec si classifier et numéro de * classifier séparé par un -, par exemple : 1.0-beta-1). - * <p/> + * * Le pattern possède toujours 4 groupes de captures. - * <p/> + * * - Le groupe 1 est le nombre de la version * - Le groupe 2 est le classifier (peut-etre null) * - Le groupe 3 est le numéro de classifier (peut-etre null) * - Le groupe 4 est le suffix -SNAPSHOT (peut-etre null) - * <p/> + * * Dans le cas d'une version simple (sans classifier), le groupe 2, 3 et * 4 sont null. - * <p/> + * * Dans le cas d'une version non snapshot, le groupe 4 est null. */ public static final Pattern VERSION_PATTERN = @@ -74,17 +74,17 @@ public class VersionUtil { /** * Pattern pour detecter une version (avec si classifier et numéro de * classifier collé, par exemple : 1.0-rc1). - * <p/> + * * Le pattern possède toujours 4 groupes de captures. - * <p/> + * * - Le groupe 1 est le nombre de la version * - Le groupe 2 est le classifier (peut-etre null) * - Le groupe 3 est le numéro de classifier (peut-etre null) * - Le groupe 4 est le suffix -SNAPSHOT (peut-etre null) - * <p/> + * * Dans le cas d'une version simple (sans classifier), le groupe 2, 3 et * 4 sont null. - * <p/> + * * Dans le cas d'une version non snapshot, le groupe 4 est null. */ public static final Pattern VERSION_PATTERN2 = @@ -243,10 +243,10 @@ public class VersionUtil { /** * Incremente le numero de version donnee, seul le dernier constituant est - * incremente: 1.2.3.4 -> 1.2.3.5; null -> 1; 0 -> 1. - * <p/> + * incremente: 1.2.3.4 → 1.2.3.5; null → 1; 0 → 1. + * * Si la version a un classifier, alors c'est la version du classifier qui - * change : 1.1-alpha-12 -> 1.1-alpha-13 + * change : 1.1-alpha-12 → 1.1-alpha-13 * * @param v la version a incrementer * @return la nouvelle version @@ -270,11 +270,11 @@ public class VersionUtil { } /** - * Remove the suffix <code>-SNAPSHOT</code> stamp from a version (if any). + * Remove the suffix {@code -SNAPSHOT} stamp from a version (if any). * * @param version the string representation of the version * @return the string representation of the given version - * without the <code>-SNAPSHOT</code> suffix (if any). + * without the {@code -SNAPSHOT} suffix (if any). * @throws NullPointerException if version is null */ public static String removeSnapshot(String version) @@ -329,20 +329,20 @@ public class VersionUtil { /** * L'implantation d'un comparateur de versions permettant de controler * l'ordre du numero de version, classifier et numero de classifer. - * <p/> + * * Toute implementation de ce contrat devrait suivre cet algorithme : - * <p/> + * * 1) Si versions égales, on quitte. - * <p/> + * * 2) On teste l'ordre des nombres {@link #compareNumbers(Version, Version)} - * <p/> + * * Si différent, alors versions différentes, on quitte - * <p/> + * * 3) On teste l'ordre des classifiers * {@link #compareClassifier(Version, Version)} - * <p/> + * * Si différent, alors versions différentes, on quitte - * <p/> + * * 4) On teste l'ordre des versions de classifiers * {@link #compareClassifierNumber(Version, Version)}. */ @@ -513,7 +513,7 @@ public class VersionUtil { /** * Trier un ensemble de versions données en entrees - * <p/> + * * On affiche le resultat dans la console * * @param args les versions diff --git a/src/main/java/org/nuiton/util/ZipUtil.java b/src/main/java/org/nuiton/util/ZipUtil.java index 6d18ec8..e081563 100644 --- a/src/main/java/org/nuiton/util/ZipUtil.java +++ b/src/main/java/org/nuiton/util/ZipUtil.java @@ -47,11 +47,11 @@ import java.util.zip.ZipOutputStream; /** * Opérations sur des fichiers Zip. Compression et décompression avec ou * sans filtres, scan des fichiers créés ou écrasés lors de la décompression... - * <p/> + * * Created: 24 août 2006 10:13:35 * - * @author bpoussin <poussin@codelutin.com> - * $Id$ + * @author Benjamin Poussin - poussin@codelutin.com + * */ public class ZipUtil { @@ -111,7 +111,7 @@ public class ZipUtil { /** * Uncompress zipped file in targetDir, and rename uncompressed file if * necessary. If renameFrom or renameTo is null no renaming is done - * <p/> + * * file in zip use / to separate directory and not begin with / * each directory ended with / * @@ -134,7 +134,7 @@ public class ZipUtil { /** * Uncompress zipped stream in targetDir, and rename uncompressed file if * necessary. If renameFrom or renameTo is null no renaming is done - * <p/> + * * file in zip use / to separate directory and not begin with / * each directory ended with / * @@ -160,7 +160,7 @@ public class ZipUtil { if (renameFrom != null && renameTo != null) { name = name.replaceAll(renameFrom, renameTo); if (log.isDebugEnabled()) { - log.debug("rename " + entry.getName() + " -> " + name); + log.debug("rename " + entry.getName() + " → " + name); } } result = name; @@ -268,7 +268,7 @@ public class ZipUtil { /** * If fileOrDirectory is directory Compress recursively all file in this * directory, else if is just file compress one file. - * <p/> + * * Entry result name in zip start at fileOrDirectory. * example: if we compress /etc/apache, entry will be apache/http.conf, ... * @@ -284,7 +284,7 @@ public class ZipUtil { /** * If fileOrDirectory is directory Compress recursively all file in this * directory, else if is just file compress one file. - * <p/> + * * Entry result name in zip start at fileOrDirectory. * example: if we compress /etc/apache, entry will be apache/http.conf, ... * @@ -302,7 +302,7 @@ public class ZipUtil { /** * If fileOrDirectory is directory Compress recursively all file in this * directory, else if is just file compress one file. - * <p/> + * * Entry result name in zip start at fileOrDirectory. * example: if we compress /etc/apache, entry will be apache/http.conf, ... * @@ -338,8 +338,8 @@ public class ZipUtil { * * @param root the root directory * @param file the file to treate - * @return the zip entry name corresponding to the given <code>file</code> - * from <code>root</code> dir. + * @return the zip entry name corresponding to the given {@code file} + * from {@code root} dir. */ private static String toZipEntryName(File root, File file) { String result = file.getPath(); @@ -365,22 +365,21 @@ public class ZipUtil { * Scan a zipFile, and fill two lists of relative paths corresponding of * zip entries. * First list contains all entries to be added while a uncompress operation - * on the destination directory </code>targetDir</code>. + * on the destination directory {@code targetDir}. * Second list contains all entries to be overwritten while a uncompress - * operation on the destination directory <code>targetDir</code>. - * <br> - * If <code>targetDir</code> is <code>null</code> we don't fill - * <cide>existingFiles<code/> list. + * operation on the destination directory {@code targetDir}. + * + * If {@code targetDir} is {@code null} we don't fill {@code existingFiles} list. * * @param zipFile location of the zip to scanZip * @param targetDir location of destination for a uncompress operation. - * If <code>null</code> we don't test to + * If {@code null} we don't test to * find overwritten files. * @param newFiles list of files to be added while a uncompress * @param existingFiles list of files to be overwritten while a uncompress - * if the <code>targetDir</code>, - * (only use if <code>targetDir</code> is not - * <code>null</code>) + * if the {@code targetDir}, + * (only use if {@code targetDir} is not + * {@code null}) * @param excludeFilter used to exclude some files * @param renameFrom {@link #uncompressAndRename(File, File, String, String)} * @param renameTo {@link #uncompressAndRename(File, File, String, String)} @@ -441,8 +440,8 @@ public class ZipUtil { /** * uncompress zipped file in targetDir. - * <p/> - * If <code>toTreate</code> if not null nor empty, we use it to filter + * + * If {@code toTreate} if not null nor empty, we use it to filter * entries to uncompress : it contains a list of relative local path of * files to uncompress. * Otherwise just delegate to {@link ZipUtil#uncompress(File, File)}. diff --git a/src/main/java/org/nuiton/util/beans/BeanMonitor.java b/src/main/java/org/nuiton/util/beans/BeanMonitor.java index bb1c227..9a895e2 100644 --- a/src/main/java/org/nuiton/util/beans/BeanMonitor.java +++ b/src/main/java/org/nuiton/util/beans/BeanMonitor.java @@ -38,23 +38,23 @@ import java.util.TreeMap; /** * A monitor of beans. - * <p/> + * * You indicates which properties to monitor (via the constructor). - * <p/> + * * Then attach a bean to monitor via the method {@link #setBean(Object)}. - * <p/> + * * The method {@link #clearModified()} reset the states about modified * properties. - * <p/> + * * The method {@link #wasModified()} tells if there was any modification on * monitored properties for the attached bean since the last call to * {@link #clearModified()} (or {@link #setBean(Object)}. - * <p/> + * * the method {@link #getModifiedProperties()} gives you the names of monitored * properties for the attached bean since the last call to * {@link #clearModified()} (or {@link #setBean(Object)}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.4.1 */ public class BeanMonitor { @@ -210,10 +210,10 @@ public class BeanMonitor { /** * Sets the {@code bean} to monitor. - * <p/> + * * As a side effect, it will attach the {@link #listener} to new bean * (if not null) and remove it from the previous bean attached (if not null). - * <p/> + * * As a second side effect, it will always clean the modified states, * using the method {@link #clearModified()}. * @@ -255,7 +255,7 @@ public class BeanMonitor { /** * To change the list of properties to watch. - * <p/> + * * <strong>Note:</strong> As a side-effect, we call a * {@link #clearModified()} method after having changed the list of * properties to watch. diff --git a/src/main/java/org/nuiton/util/beans/BeanUtil.java b/src/main/java/org/nuiton/util/beans/BeanUtil.java index 52123bb..10fc39f 100644 --- a/src/main/java/org/nuiton/util/beans/BeanUtil.java +++ b/src/main/java/org/nuiton/util/beans/BeanUtil.java @@ -38,7 +38,7 @@ import java.util.TreeMap; /** * Usefull methods around the {@link PropertyChangeListener}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.4.1 */ public class BeanUtil { @@ -285,7 +285,7 @@ public class BeanUtil { * Scan the given type and obtain {@link PropertyDescriptor} * given the (optional) predicate (except the {@code class} property of * any java object). - * <p/> + * * <strong>Note:</strong> If no predicate is given, then all descriptors * are returned. * diff --git a/src/main/java/org/nuiton/util/beans/Binder.java b/src/main/java/org/nuiton/util/beans/Binder.java index 6ee7ad2..23a979e 100644 --- a/src/main/java/org/nuiton/util/beans/Binder.java +++ b/src/main/java/org/nuiton/util/beans/Binder.java @@ -50,21 +50,21 @@ import java.util.TreeMap; /** * A {@code binder} permits to copy some properties from an object to another * one. - * <p/> + * * It is based on a {@link BinderModel} which contains the mapping of properties * to transfert from the source object to the destination object. - * <p/> + * * Use the method {@link #copy(Object, Object, String...)} to transfert properties. - * <p/> + * * Use the method {@link #obtainProperties(Object, String...)} to obtain some * properties from a given object. - * <p/> + * * For more informations about how to obtain a binder, see the * {@link BinderFactory} or the package info javadoc or unit tests... * * @param <I> the source bean type * @param <O> the destination bean type - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see BinderFactory * @see BinderModelBuilder * @since 1.1.5 @@ -231,7 +231,7 @@ public class Binder<I, O> implements Serializable { /** * Obtain from the given object all properties registered in the binder * model. - * <p/> + * * <b>Note:</b> If a property's value is null, it will not be injected in * the result. * @@ -394,7 +394,7 @@ public class Binder<I, O> implements Serializable { * Copy properties from a source bean to a destination one according to * the model of the binder. If {@code propertyNames} is defined, only * those properties will be copied. - * <p/> + * * <b>Note:</b> If {@code from} object is null, then {@code null} values * will be set to mapped properties into {@code dst} * @@ -412,7 +412,7 @@ public class Binder<I, O> implements Serializable { /** * Copy properties from a source bean to a destination one according to * the model of the binder excluding {@code propertyNames}. - * <p/> + * * <b>Note:</b> If {@code from} object is null, then {@code null} values * will be set to mapped properties into {@code dst}. * @@ -486,7 +486,7 @@ public class Binder<I, O> implements Serializable { /** * Copy properties from a source bean to a destination one according to * the model of the binder. - * <p/> + * * <b>Note:</b> If {@code from} object is null, then {@code null} values * will be set to mapped properties into {@code dst}. * @@ -645,7 +645,7 @@ public class Binder<I, O> implements Serializable { /** * Compare two beans property by property according to the model. - * <p/> + * * List contains one element per property with different values (according * to the result of an equals() call) * @@ -661,7 +661,7 @@ public class Binder<I, O> implements Serializable { /** * Compare two beans property by property according to the model. - * <p/> + * * List contains one element per property with different values (according * to the result of an equals() call) * @@ -801,12 +801,12 @@ public class Binder<I, O> implements Serializable { /** * Model of a {@link Binder}. - * <p/> + * * TODO tchemit 20100225 should have special cases for collections treatment. * * @param <S> the source type * @param <T> the target type - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1.5 */ public static class BinderModel<S, T> implements Serializable { diff --git a/src/main/java/org/nuiton/util/beans/BinderFactory.java b/src/main/java/org/nuiton/util/beans/BinderFactory.java index e75e3fe..e2704ce 100644 --- a/src/main/java/org/nuiton/util/beans/BinderFactory.java +++ b/src/main/java/org/nuiton/util/beans/BinderFactory.java @@ -31,33 +31,33 @@ import java.util.Set; /** * Factory of {@link Binder}. - * <p/> + * * <h1>Obtain a new binder</h1> * To obtain a new binder you can use the {@code newBinder(XXX)} methods. - * <p/> + * * For example to obtain a mirrored binder (same source and target type) which * will be able to copy all accepting properties, use this code : * <pre> - * Binder<BeanA, BeanA> binder = BinderFactory.newBinder(BeanA.class); + * Binder<BeanA, BeanA> binder = BinderFactory.newBinder(BeanA.class); * </pre> * <h1>Usage of contextale binder</h1> * It is possible to use different binder for same source and target type, using a * extra context name parameter, like this : * <pre> - * Binder<BeanA, BeanA> binder = BinderFactory.newBinder(BeanA.class, "mycontext"); + * Binder<BeanA, BeanA> binder = BinderFactory.newBinder(BeanA.class, "mycontext"); * </pre> - * <p/> + * * This is usefull when you register your own binder model in the factory (see * next section) to bind different things from the same type of objects... - * <p/> + * * <h1>Register a new binder model</h1> * To register a new binder's model use one of the method {@code registerBinderModel(XXX)}. - * <p/> - * <p/> + * + * * More documentation will come soon, yu can see the package info javadoc or * unit tests... * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.5.3 */ public class BinderFactory { @@ -201,7 +201,7 @@ public class BinderFactory { /** * Given a {@code model} and a {@code binderType}, instanciate a new binder * and returns it. - * <p/> + * * <strong>Note: </strong> This method will <strong>NOT</strong> register * the model in the factory. If you want to reuse your model, please use * one of the {@code registerBinderModel(XXX)} method. @@ -231,8 +231,8 @@ public class BinderFactory { /** * Clear the cache of registred binder models. - * <p/> - * <b>Note :<b> This is a convienient method for test purposes and should + * + * <b>Note :</b> This is a convienient method for test purposes and should * be used in a normal usage of this provider. */ public static void clear() { @@ -296,7 +296,7 @@ public class BinderFactory { /** * Instanciate a new binder given his types and his context's name. - * <p/> + * * If the corresponding binder model does not exist, then it will be created * and cached (using the {@link BinderModelBuilder#newDefaultBuilder(Class, Class)} method). * @@ -446,7 +446,7 @@ public class BinderFactory { /** * Definition of an binder model entry (source and target types + context name). - * <p/> + * * <b>Note :</b>When no context is specified, we always use a * {@code null} context name. */ diff --git a/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java b/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java index f905457..dcb9d39 100644 --- a/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java +++ b/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java @@ -38,16 +38,16 @@ import java.util.TreeMap; /** * Class to create a new {@link Binder.BinderModel}. - * <p/> - * <p/> + * + * * A such object is designed to build only one model of binder and can not be * used directly to create a new binder, it prepares only the model of a new * binder, which after must be registred in the {@link BinderFactory} to obtain * a real {@link Binder}. - * <p/> + * * If you want to create more than one binder model, use each time a new * binder builder. - * <p/> + * * To obtain a new instance of a build please use one of the factories method : * <ul> * <li>{@link #newEmptyBuilder(Class)}} to create a binder model with same @@ -84,23 +84,22 @@ import java.util.TreeMap; * <pre> * builder.addSimpleProperties(...).addProperty(...).addBinder(...) * </pre> - * <p/> + * * Here is an example of how to use the {@link BinderModelBuilder} : * <pre> - * BinderModelBuilder<Bean, Bean> builder = new BinderModelBuilder(Bean.class); + * BinderModelBuilder<Bean, Bean> builder = new BinderModelBuilder(Bean.class); * builder.addSimpleProperties("name", "surname"); * BinderFactory.registerBinderModel(builder); - * Binder<Bean, Bean> binder = BinderFactory.getBinder(BeanA.class); - * + * Binder<Bean, Bean> binder = BinderFactory.getBinder(BeanA.class); * </pre> - * <p/> + * * Once the binder is registred into the {@link BinderFactory}, you can get it * each time you need it : * <pre> - * Binder<Bean, Bean> binder = BinderFactory.getBinder(Bean.class); + * Binder<Bean, Bean> binder = BinderFactory.getBinder(Bean.class); * </pre> * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see Binder.BinderModel * @see Binder * @since 1.5.3 @@ -253,7 +252,7 @@ public class BinderModelBuilder<S, T> { /** * Convinient method to create directly a {@link Binder} using the * underlying {@link #model} the builder contains. - * <p/> + * * <strong>Note:</strong> Using this method will not make reusable the model * via the {@link BinderFactory}. * @@ -269,7 +268,7 @@ public class BinderModelBuilder<S, T> { /** * Convinient method to create directly a {@link Binder} using the * underlying {@link #model} the builder contains. - * <p/> + * * <strong>Note:</strong> Using this method will not make reusable the model * via the {@link BinderFactory}. * @@ -294,7 +293,7 @@ public class BinderModelBuilder<S, T> { /** * Add to the binder model some simple properties (says source property name * = target property name). - * <p/> + * * <b>Note:</b> If no model is present, the method will fail. * * @param properties the name of mirrored property @@ -317,7 +316,7 @@ public class BinderModelBuilder<S, T> { /** * Add to the binder model some simple properties (says source property name * = target property name). - * <p/> + * * <b>Note:</b> If no model is present, the method will fail. * * @param sourceProperty the name of the source property to bind @@ -344,15 +343,15 @@ public class BinderModelBuilder<S, T> { /** * Add to the binder model some properties. - * <p/> + * * Parameter {@code sourceAndTargetProperties} must be a array of couple * of {@code sourceProperty}, {@code targetProperty}. - * <p/> + * * Example : * <pre> * builder.addProperties("name","name2","text","text"); * </pre> - * <p/> + * * <b>Note:</b> If no model is present, the method will fail. * * @param sourceAndTargetProperties the couple of (sourceProperty - diff --git a/src/main/java/org/nuiton/util/beans/InstanceFactory.java b/src/main/java/org/nuiton/util/beans/InstanceFactory.java index fad04ca..6bd17a8 100644 --- a/src/main/java/org/nuiton/util/beans/InstanceFactory.java +++ b/src/main/java/org/nuiton/util/beans/InstanceFactory.java @@ -22,10 +22,10 @@ package org.nuiton.util.beans; /** - * @author Sylvain Bavencoff <bavencoff@codelutin.com> + * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface InstanceFactory<O> { - public O newInstance(); + O newInstance(); } diff --git a/src/main/java/org/nuiton/util/beans/PropertyDiff.java b/src/main/java/org/nuiton/util/beans/PropertyDiff.java index 3b25556..fed8e37 100644 --- a/src/main/java/org/nuiton/util/beans/PropertyDiff.java +++ b/src/main/java/org/nuiton/util/beans/PropertyDiff.java @@ -24,7 +24,7 @@ package org.nuiton.util.beans; /** * TODO * - * @author bleny <leny@codelutin.com> + * @author Brendan Le Ny - bleny@codelutin.com * @since 2.4 */ public class PropertyDiff { diff --git a/src/main/java/org/nuiton/util/beans/package-info.java b/src/main/java/org/nuiton/util/beans/package-info.java index 4449bd4..974cf82 100644 --- a/src/main/java/org/nuiton/util/beans/package-info.java +++ b/src/main/java/org/nuiton/util/beans/package-info.java @@ -33,14 +33,14 @@ * This api permits to some object properties from an object to another one. * </p> * <h2>Obtain a binder</h2> - * A {@link org.nuiton.util.beans.Binder} contains a safe model named + * <p>A {@link org.nuiton.util.beans.Binder} contains a safe model named * {@link org.nuiton.util.beans.Binder.BinderModel} which knows * all properties that can be copied. - * <br/> + * </p> * To use this api, you have only to get a {@link org.nuiton.util.beans.Binder} * object from the {@link org.nuiton.util.beans.BinderFactory} like this : * <pre> - * Binder<A, A> binder = BinderFactory.newBinder(A.class); + * Binder<A, A> binder = BinderFactory.newBinder(A.class); * </pre> * * It is also possible to build a more sofisticated binder which will only copy @@ -48,7 +48,7 @@ * * <h2>Use a binder</h2> * Once you have a binder, you use the {@link org.nuiton.util.beans.Binder} api : - * <p/> + * * To copy all properties from an object to another one : * <pre> * binder.copy(source, target); @@ -66,7 +66,7 @@ * * To obtain some properties from an object, use the following code : * <pre> - * Map<String, Object> properties = binder.obtainProperties(source, "propertyOne", "propertyTwo"); + * Map<String, Object> properties = binder.obtainProperties(source, "propertyOne", "propertyTwo"); * </pre> * * <h2>Building a new BinderModel</h2> @@ -78,8 +78,9 @@ * {@code org.nuiton.util.beans.BinderFactory#registerBinderModel(XXX)}. * </p> * More explainations will come soon... - * <br/> + * <p> * You can go and look on the unit tests which describe it pretty well :) : + * </p> * <pre> * org.nuiton.util.beans.BinderModelBuilderTest * </pre> @@ -94,7 +95,6 @@ * org.nuiton.util.beans.BeanMonitorTest * </pre> * - * * @since 1.1.5 */ package org.nuiton.util.beans; diff --git a/src/main/java/org/nuiton/util/converter/ColorConverter.java b/src/main/java/org/nuiton/util/converter/ColorConverter.java index e2d7da6..20aa2ea 100644 --- a/src/main/java/org/nuiton/util/converter/ColorConverter.java +++ b/src/main/java/org/nuiton/util/converter/ColorConverter.java @@ -31,8 +31,8 @@ import java.util.Scanner; /** * Converter of {@link Color}. * - * @author mallon <mallon@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author Matthieu Allon + * @author Tony Chemit - chemit@codelutin.com * @since 2.5.3 * @deprecated since 3.0 use instead {@link org.nuiton.converter.ColorConverter} (<strong>Note:</strong> This converter is no more loaded by the {@link ConverterUtil#initConverters()}) */ diff --git a/src/main/java/org/nuiton/util/converter/ConverterUtil.java b/src/main/java/org/nuiton/util/converter/ConverterUtil.java index da174cc..0fa9b84 100644 --- a/src/main/java/org/nuiton/util/converter/ConverterUtil.java +++ b/src/main/java/org/nuiton/util/converter/ConverterUtil.java @@ -33,7 +33,7 @@ import java.util.ServiceLoader; /** * Une classe contenant des méthodes utiles sur les converters et les conversions * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 (replace {@code org.nuiton.util.ConverterUtil}). * @deprecated since 3.0 use instead {@link org.nuiton.converter.ConverterUtil} */ @@ -53,13 +53,13 @@ public class ConverterUtil { protected static Boolean WAS_INIT = Boolean.FALSE; /** - * Cherche un converter pour un <code>type</code> donné. - * <p/> + * Cherche un converter pour un {@code type} donné. + * * Recherche dans un premier temps dans les converteurs déjà connus. - * <p/> + * * Si le type est une énum et qu'aucun converter, n'a été trouvé, on * enregistre un nouveau convert d'enum. - * <p/> + * * Sinon on tente d'instancier un converteur dans le paquetage dédié aux * converteurs {@link #CONVERTER_PACKAGE}. * diff --git a/src/main/java/org/nuiton/util/converter/EnumConverter.java b/src/main/java/org/nuiton/util/converter/EnumConverter.java index 5b454b4..2ac9a0e 100644 --- a/src/main/java/org/nuiton/util/converter/EnumConverter.java +++ b/src/main/java/org/nuiton/util/converter/EnumConverter.java @@ -34,14 +34,14 @@ import static org.nuiton.i18n.I18n.t; /** * classe pour convertir une chaine en un objet Enum type-safe en * connaissant le type d'enumération utilisée {@link #enumType}. - * <p/> + * * Il est possible aussi de convertir une Enum à partir de sa valeur ordinal. - * <p/> + * * Pour enregister un nouveau convertissemnt pour un type d'Enum utiliser les * méthodes * {@link ConverterUtil#registerEnumConverter(Class)}, * et {@link ConverterUtil#registerEnumConverter(Class, Object)} . * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see Enum * @see Enum#ordinal() * @deprecated since 3.0 use instead {@link org.nuiton.converter.EnumConverter} diff --git a/src/main/java/org/nuiton/util/converter/FormatConverter.java b/src/main/java/org/nuiton/util/converter/FormatConverter.java index d5bc7f3..5476531 100644 --- a/src/main/java/org/nuiton/util/converter/FormatConverter.java +++ b/src/main/java/org/nuiton/util/converter/FormatConverter.java @@ -20,22 +20,13 @@ * #L% */ -/* * - * FormatConverter.java - * - * Created: 14 septembre 2005 00:55:19 CEST - * - * @author Benjamin POUSSIN <poussin@codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : */ - package org.nuiton.util.converter; import org.nuiton.util.converter.FormatMap.Format; /** + * Created: 14 septembre 2005 00:55:19 CEST + * <p> * Un converter est un objet qui permet de passé d'une representation d'un * objet vers une autre representation. Le mininum que converter doit savoir * faire, est de converter une representation Java vers le format qu'il @@ -44,6 +35,7 @@ import org.nuiton.util.converter.FormatMap.Format; * pour eviter une conversion supplémentaire qui pourrait-etre couteuse. * * @param <A> le type de l'objet a convertir + * @author Benjamin Poussin - poussin@codelutin.com * @deprecated since 3.0, will not pe replaced by anything (see https://forge.nuiton.org/issues/3326); will be removed later */ @Deprecated diff --git a/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java b/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java index 5429255..4bb4118 100644 --- a/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java +++ b/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java @@ -48,11 +48,10 @@ import java.util.LinkedList; * values, AppContext); * </pre> * Dans ce cas pour des raisons d'optimisation - * <p/> + * * Created: 14 septembre 2005 00:19:51 CEST * - * @author Benjamin POUSSIN <poussin@codelutin.com> - * @version $Id$ + * @author Benjamin Poussin - poussin@codelutin.com * @since 1.3 replace the class {@code org.nuiton.util.FormatConverterFactory}. * @deprecated since 3.0, will not pe replaced by anything (see https://forge.nuiton.org/issues/3326); will be removed later */ @@ -64,7 +63,7 @@ public class FormatConverterFactory { // FormatConverterFactory static protected FormatConverterFactory instance; - /** <Class, from, to -> FormatConverter> */ + /** <Class, from, to → FormatConverter> */ protected MultiKeyMap converters = new MultiKeyMap(); synchronized public static FormatConverterFactory getInstance() { diff --git a/src/main/java/org/nuiton/util/converter/FormatMap.java b/src/main/java/org/nuiton/util/converter/FormatMap.java index 71d0ef1..a4c9282 100644 --- a/src/main/java/org/nuiton/util/converter/FormatMap.java +++ b/src/main/java/org/nuiton/util/converter/FormatMap.java @@ -30,7 +30,7 @@ import java.util.Map; * est lors de l'ecriture des convertisseurs pour un nouveau format est de * créer une instance final static de {@link Format} Format pour representer * ce format - * <p/> + * * <h2>Utilisation</h2> * <pre> * FormatMap values = new FormatMap(MonObject.class); @@ -48,16 +48,15 @@ import java.util.Map; * cette representation Java, on recupere la representation SQL. Bien sur * Si le convertisseur SQL, peut directement convertir le XML en SQL, alors * la conversion Java ne sera pas faite. - * <p/> + * * Il est souvent plus simple de faire une petite classe avec les methodes * getSQL() et getXML(), qui retourne les valeurs directement dans le bon type * et qui n'ont pas besoin d'argument. - * <p/> - * <p/> + * + * * Created: 16 septembre 2005 10:41:58 CEST * - * @author Benjamin POUSSIN <poussin@codelutin.com> - * @version $Id$ + * @author Benjamin Poussin - poussin@codelutin.com * @since 1.3 (replace {@code org.nuiton.util.FormatMap} class). * @deprecated since 3.0, will not pe replaced by anything (see https://forge.nuiton.org/issues/3326); will be removed later */ diff --git a/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java b/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java index 0b2355a..4d9feee 100644 --- a/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java +++ b/src/main/java/org/nuiton/util/converter/KeyStrokeConverter.java @@ -21,18 +21,19 @@ */ package org.nuiton.util.converter; -import javax.swing.KeyStroke; import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; import org.apache.commons.logging.Log; +import javax.swing.KeyStroke; + import static org.apache.commons.logging.LogFactory.getLog; import static org.nuiton.i18n.I18n.t; /** * Used to convert a {@link String} to {@link KeyStroke}. * - * @author sletellier <letellier@codelutin.com> + * @author Sylvain Letellier * @since 2.5.1 * @deprecated since 3.0 use instead {@link org.nuiton.converter.KeyStrokeConverter} (<strong>Note:</strong> This converter is no more loaded by the {@link ConverterUtil#initConverters()}) */ diff --git a/src/main/java/org/nuiton/util/converter/URIConverter.java b/src/main/java/org/nuiton/util/converter/URIConverter.java index c2c8bca..61a906f 100644 --- a/src/main/java/org/nuiton/util/converter/URIConverter.java +++ b/src/main/java/org/nuiton/util/converter/URIConverter.java @@ -35,7 +35,7 @@ import static org.nuiton.i18n.I18n.t; /** * classe pour convertir une chaine en un objet URI. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 (replace {@code org.nuiton.util.URIConverter}). * @deprecated since 3.0 use instead {@link org.nuiton.converter.URIConverter} (<strong>Note:</strong> This converter is no more loaded by the {@link ConverterUtil#initConverters()}) */ diff --git a/src/main/java/org/nuiton/util/converter/URLConverter.java b/src/main/java/org/nuiton/util/converter/URLConverter.java index dd152aa..a4c85d2 100644 --- a/src/main/java/org/nuiton/util/converter/URLConverter.java +++ b/src/main/java/org/nuiton/util/converter/URLConverter.java @@ -35,7 +35,7 @@ import static org.nuiton.i18n.I18n.t; /** * classe pour convertir une chaine en un objet URL. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 (replace {@code org.nuiton.util.URLConverter}). * @deprecated since 3.0 use instead {@link org.nuiton.converter.URLConverter} (<strong>Note:</strong> This converter is no more loaded by the {@link ConverterUtil#initConverters()}) */ diff --git a/src/main/java/org/nuiton/util/converter/VersionConverter.java b/src/main/java/org/nuiton/util/converter/VersionConverter.java index d35f55e..6d12f5a 100644 --- a/src/main/java/org/nuiton/util/converter/VersionConverter.java +++ b/src/main/java/org/nuiton/util/converter/VersionConverter.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.t; /** * classe pour convertir une chaine en un objet Version. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see Version * @since 1.3 (replace {@code org.nuiton.util.VersionConverter}). * @deprecated since 3.0, prefer use the {@link org.nuiton.util.version.VersionConverter}. diff --git a/src/main/java/org/nuiton/util/converter/package-info.java b/src/main/java/org/nuiton/util/converter/package-info.java index f439c98..8a430c9 100644 --- a/src/main/java/org/nuiton/util/converter/package-info.java +++ b/src/main/java/org/nuiton/util/converter/package-info.java @@ -22,18 +22,18 @@ /** * * This package contains the converter api + the format api. - * <p/> + * * <h1>Converter api</h1> * This converter api is based on the * http://commons.apache.org/beanutils {@code commons-beanutils}. - * <p/> + * * Use the {@link org.nuiton.util.converter.ConverterUtil} to register or obtain a * converter. * - * <h1<Format api</h1> + * <h1>Format api</h1> * see {@link org.nuiton.util.converter.FormatConverter} and others * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 * @deprecated since 3.0 (see https://forge.nuiton.org/issues/3320), will be removed after version 3.0 */ diff --git a/src/main/java/org/nuiton/util/pagination/PaginationParameter.java b/src/main/java/org/nuiton/util/pagination/PaginationParameter.java index ce421cd..e2d52fa 100644 --- a/src/main/java/org/nuiton/util/pagination/PaginationParameter.java +++ b/src/main/java/org/nuiton/util/pagination/PaginationParameter.java @@ -22,15 +22,15 @@ package org.nuiton.util.pagination; * #L% */ +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; + import java.io.Serializable; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - /** * This class represents the necessary information to do pagination (page number, size, ...). * @@ -83,7 +83,7 @@ public class PaginationParameter implements Serializable { /** * Method to create a PaginationParameter based on pageNumber, pageSize and a single order clause. - * <p/> + * * If you have an unknown number of order clauses, you should use the {@link #builder(int, int)} * method together with {@link PaginationParameterBuilder#addOrder(String, boolean)} and * {@link PaginationParameterBuilder#build()} methods. @@ -105,7 +105,7 @@ public class PaginationParameter implements Serializable { /** * Method to create a PaginationParameter based on pageNumber, pageSize and two order clauses. - * <p/> + * * If you have an unknown number of order clauses, you should use the {@link #builder(int, int)} * method together with {@link PaginationParameterBuilder#addOrder(String, boolean)} and * {@link PaginationParameterBuilder#build()} methods. @@ -131,7 +131,7 @@ public class PaginationParameter implements Serializable { /** * Method to create a PaginationParameter based on pageNumber, pageSize and three order clauses. - * <p/> + * * If you have more order clauses, or an unknown number of clauses, you should use the {@link #builder(int, int)} * method together with {@link PaginationParameterBuilder#addOrder(String, boolean)} and * {@link PaginationParameterBuilder#build()} methods. diff --git a/src/main/java/org/nuiton/util/rmi/RemoteMethodExecutor.java b/src/main/java/org/nuiton/util/rmi/RemoteMethodExecutor.java index 875d114..a7c4126 100644 --- a/src/main/java/org/nuiton/util/rmi/RemoteMethodExecutor.java +++ b/src/main/java/org/nuiton/util/rmi/RemoteMethodExecutor.java @@ -27,7 +27,7 @@ import java.rmi.RemoteException; /** * This class will act as an InvocationHandler except that it is distributed. * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public interface RemoteMethodExecutor extends Remote { diff --git a/src/main/java/org/nuiton/util/rmi/RemoteMethodExecutorImpl.java b/src/main/java/org/nuiton/util/rmi/RemoteMethodExecutorImpl.java index 6981726..7811173 100644 --- a/src/main/java/org/nuiton/util/rmi/RemoteMethodExecutorImpl.java +++ b/src/main/java/org/nuiton/util/rmi/RemoteMethodExecutorImpl.java @@ -30,7 +30,7 @@ import java.rmi.RemoteException; * a RMI registry and will delegate method calls to some business service. The * service is provided in the constructor. * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public class RemoteMethodExecutorImpl<T> implements RemoteMethodExecutor { diff --git a/src/main/java/org/nuiton/util/rmi/RemoteProxyFactory.java b/src/main/java/org/nuiton/util/rmi/RemoteProxyFactory.java index 04fafe8..da30df7 100644 --- a/src/main/java/org/nuiton/util/rmi/RemoteProxyFactory.java +++ b/src/main/java/org/nuiton/util/rmi/RemoteProxyFactory.java @@ -37,7 +37,7 @@ import java.rmi.registry.Registry; /** * Factory to create RMI proxies to some given services. * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public class RemoteProxyFactory { @@ -54,7 +54,7 @@ public class RemoteProxyFactory { * * @param serviceInterface The class of the service proxy to create * @param <T> some interface class - * @return A newly created proxy which interface is <T> + * @return A newly created proxy which interface is <T> * @throws RemoteException in case the registry is not reachable * @throws NotBoundException if the default RMI name cannot be found in the * registry @@ -77,7 +77,7 @@ public class RemoteProxyFactory { * in the registry * @param serviceInterface The class of the service proxy to create * @param <T> some interface class - * @return A newly created proxy which interface is <T> + * @return A newly created proxy which interface is <T> * @throws RemoteException in case the registry is not reachable * @throws NotBoundException if the default RMI name cannot be found in the * registry diff --git a/src/main/java/org/nuiton/util/rmi/ServiceExporter.java b/src/main/java/org/nuiton/util/rmi/ServiceExporter.java index 3f19556..c181c2b 100644 --- a/src/main/java/org/nuiton/util/rmi/ServiceExporter.java +++ b/src/main/java/org/nuiton/util/rmi/ServiceExporter.java @@ -38,7 +38,7 @@ import java.rmi.server.UnicastRemoteObject; * a wrapper will be created which will be put in the RMI registry. This wrapper * will intercept calls to the service and delegate them to it. * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public final class ServiceExporter { diff --git a/src/main/java/org/nuiton/util/rmi/package-info.java b/src/main/java/org/nuiton/util/rmi/package-info.java index 1d66c5d..c14098c 100644 --- a/src/main/java/org/nuiton/util/rmi/package-info.java +++ b/src/main/java/org/nuiton/util/rmi/package-info.java @@ -23,12 +23,12 @@ * This package contains classes to easily export services to a RMI registry * then get a proxy to access them. The provided classes will hide RMI * complexity. - * <p/> + * * Use the {@link org.nuiton.util.rmi.ServiceExporter} to register an service to the RMI registry. - * <p/> + * * Use the {@link org.nuiton.util.rmi.RemoteProxyFactory} to get a proxy an call the RMI exported * service. * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ package org.nuiton.util.rmi; diff --git a/src/main/java/org/nuiton/util/version/SemVer.java b/src/main/java/org/nuiton/util/version/SemVer.java index e185752..2d74a5e 100644 --- a/src/main/java/org/nuiton/util/version/SemVer.java +++ b/src/main/java/org/nuiton/util/version/SemVer.java @@ -38,12 +38,13 @@ import java.util.regex.Pattern; * pour modifier un de ses elements * * Quelques changement par rapport au site: + * <ul> * <li> le numero de version peut avoir entre 1 et N element, et non pas 3 obligatoirement * <li> on peut avoir un -SNAPSHOT ajoute en toute fin de la version - * + * </ul> * Un SemVer est en plusieurs elements dont chaque element peut avoir plusieurs * composant. Les composants sont utilise le meme separateur '.'. - * + * <ul> * <li> version: 1 à N composant numerique, les 3 premiers sont nomme * <ul> * <li> major @@ -53,26 +54,23 @@ import java.util.regex.Pattern; * <li> prerelease: 0 à N composant alphanumerique, le prefix est '-' * <li> build: 0 à N composant alphanumerique, le prefix est '+' * <li> SNAPSHOT: 0 ou 1 composant dont le nom est fixe le prefix est '-' + * </ul> + * Le mieux pour construire ou modifier un SemVer est d'utilise une methode creator: + * <ul> + * <li> SemVer.creator(1,2,3).done() → "1.2.3" + * <li> SemVer.creator("1.2.3","rc2").done() → "1.2.3-rc2" + * <li> SemVer.creator().setVersion(2.3.4).setBuild("r223").done() → "2.3.4+r223" + * <li> SemVer.creator().setVersion(2.3.4).setSnapshot(true).done() → "2.3.4-SNAPSHOT" + * <li> SemVer.creator(new SemVer("1.2.3")).incMajor().done() → "2.2.2" + * <li> new SemVer("1.2.3").getCreator().incMinor().setPrerelease(beta).done() → "1.3.3-beta" + * </ul> * - * Le mieux pour construire ou modifier un SemVer est d'utilise une methode - * creator: - * <li> SemVer.creator(1,2,3).done() => "1.2.3" - * <li> SemVer.creator("1.2.3","rc2").done() => "1.2.3-rc2" - * <li> SemVer.creator().setVersion(2.3.4).setBuild("r223").done() => "2.3.4+r223" - * <li> SemVer.creator().setVersion(2.3.4).setSnapshot(true).done() => "2.3.4-SNAPSHOT" - * <li> SemVer.creator(new SemVer("1.2.3")).incMajor().done() => "2.2.2" - * <li> new SemVer("1.2.3").getCreator().incMinor().setPrerelease(beta).done() => "1.3.3-beta" - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @author Benjamin Poussin - poussin@codelutin.com * @since 2.6.7 */ public class SemVer implements Comparable<SemVer> { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger. */ static private Log log = LogFactory.getLog(SemVer.class); /** Separateur utiliser entre chaque element d'une partie */ @@ -134,7 +132,7 @@ public class SemVer implements Comparable<SemVer> { /** * @param o the other version to test - * @return <code>true</code> if current version is before the given one + * @return {@code true} if current version is before the given one */ public boolean before(SemVer o) { int result = compareTo(o); @@ -143,7 +141,7 @@ public class SemVer implements Comparable<SemVer> { /** * @param o the other version to test - * @return <code>true</code> if current version is after the given one + * @return {@code true} if current version is after the given one */ public boolean after(SemVer o) { int result = compareTo(o); @@ -256,8 +254,10 @@ public class SemVer implements Comparable<SemVer> { /** * Donne le nombre de composante de l'element - * <li>1.2.3 retourne 3 - * <li>99.100 retourne 2 + * <ul> + * <li>1.2.3 retourne 3</li> + * <li>99.100 retourne 2</li> + * </ul> * * @return */ @@ -291,8 +291,10 @@ public class SemVer implements Comparable<SemVer> { /** * Donne le nombre de composante de la version - * <li>1.2.3 retourne 3 - * <li>99.100 retourne 2 + * <ul> + * <li>1.2.3 retourne 3</li> + * <li>99.100 retourne 2</li> + * </ul> * * @return */ @@ -332,8 +334,10 @@ public class SemVer implements Comparable<SemVer> { /** * Donne le nombre de composante de la Prerelease - * <li>1.2.3 retourne 3 - * <li>99.100 retourne 2 + * <ul> + * <li>1.2.3 retourne 3</li> + * <li>99.100 retourne 2</li> + * </ul> * * @return */ @@ -358,8 +362,10 @@ public class SemVer implements Comparable<SemVer> { /** * Donne le nombre de composante de la Prerelease - * <li>1.2.3 retourne 3 - * <li>99.100 retourne 2 + * <ul> + * <li>1.2.3 retourne 3</li> + * <li>99.100 retourne 2</li> + * </ul> * * @return */ diff --git a/src/main/java/org/nuiton/util/version/Version.java b/src/main/java/org/nuiton/util/version/Version.java index 8d52dbf..56ab469 100644 --- a/src/main/java/org/nuiton/util/version/Version.java +++ b/src/main/java/org/nuiton/util/version/Version.java @@ -53,7 +53,7 @@ import java.util.List; * </p> * <h4>Snapshot flag</h4> * Additionnaly version can be qualifed as a {@code SNAPSHOT} (see below section about ordering). - * <h3Examples</h3> + * <h3>Examples</h3> * <pre> * 0 (one componant 0) * 0-SNAPSHOT (one componant 0 + SNAPSHOT flag) @@ -71,7 +71,7 @@ import java.util.List; * The version is immutable, to create or modify a version, use the {@link VersionBuilder} API * or shortcut methods in {@link Versions}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see VersionBuilder * @see VersionComparator * @since 3.0 @@ -188,12 +188,12 @@ public class Version implements Comparable<Version>, Serializable { /** * Convert the string representation to a java identifier compliant. - * <p/> + * * <ul> * <li>in java: {@code .} is forbidden</li> * <li>in database (mysql, h2 ...): {@code .} is forbidden</li> * </ul> - * <p/> + * * Forbidden values are replaced by {@code _} character. * * @return the java compilant string representation of the version @@ -211,14 +211,14 @@ public class Version implements Comparable<Version>, Serializable { /** * Creates a new version from this one incremented. - * <p/> + * * If the last componant is a number, then just increments this number; otherwise add a new * number componant with value 1. - * <p/> + * * Example: * <ul> - * <li>1 -> 2</li> - * <li>1-a -> 1-a.1</li> + * <li>1 → 2</li> + * <li>1-a → 1-a.1</li> * </ul> * * @return the incremented version @@ -234,14 +234,14 @@ public class Version implements Comparable<Version>, Serializable { /** * Creates a new version from this one incremented. - * <p/> + * * If the last componant is a number, then just increments this number; otherwise add a new * number componant with value 1. - * <p/> + * * Example: * <ul> - * <li>1 -> 2</li> - * <li>1-a -> 1-a.1</li> + * <li>1 → 2</li> + * <li>1-a → 1-a.1</li> * </ul> * * @param componantSeperator the componant separator to use the last componant is a classifier @@ -258,7 +258,7 @@ public class Version implements Comparable<Version>, Serializable { /** * Creates a new version from this one with the number componant incremented at the given position. - * <p/> + * * <strong>Note:</strong> * Will fail if the componant at the required position is not a number. * @@ -276,7 +276,7 @@ public class Version implements Comparable<Version>, Serializable { /** * Creates a new version from this one with the number componant decremented at the given position. - * <p/> + * * <strong>Note:</strong> * Will fail if the componant at the required position is not a number, or his value is 0. * @@ -309,7 +309,7 @@ public class Version implements Comparable<Version>, Serializable { /** * @param o the other version to test - * @return <code>true</code> if current version is before the given one + * @return {@code true} if current version is before the given one */ public boolean before(Version o) { int result = compareTo(o); @@ -327,7 +327,7 @@ public class Version implements Comparable<Version>, Serializable { /** * @param o the other version to test - * @return <code>true</code> if current version is after the given one + * @return {@code true} if current version is after the given one */ public boolean after(Version o) { int result = compareTo(o); @@ -362,7 +362,7 @@ public class Version implements Comparable<Version>, Serializable { } - public static interface VersionComponant<C extends Comparable<C>, V extends VersionComponant> extends Serializable, Comparable<V> { + public interface VersionComponant<C extends Comparable<C>, V extends VersionComponant> extends Serializable, Comparable<V> { C getValue(); diff --git a/src/main/java/org/nuiton/util/version/VersionBuilder.java b/src/main/java/org/nuiton/util/version/VersionBuilder.java index 3903ed6..936d67c 100644 --- a/src/main/java/org/nuiton/util/version/VersionBuilder.java +++ b/src/main/java/org/nuiton/util/version/VersionBuilder.java @@ -36,7 +36,7 @@ import java.util.Set; /** * To build some {@link Version}. - * <p/> + * * <h3>General usage</h3> * Use one the {@code create} methods, custom what you need on build, and finally * use {@link #build()} method to obtain a version. @@ -50,7 +50,7 @@ import java.util.Set; * </ul> * <h3>Customize componants</h3> * TODO - * <p/> + * * Created on 7/11/14. * * @author Tony Chemit - chemit@codelutin.com diff --git a/src/main/java/org/nuiton/util/version/VersionComparator.java b/src/main/java/org/nuiton/util/version/VersionComparator.java index 9f6f46f..b969532 100644 --- a/src/main/java/org/nuiton/util/version/VersionComparator.java +++ b/src/main/java/org/nuiton/util/version/VersionComparator.java @@ -33,30 +33,30 @@ import java.util.List; /** * Comparator of {@link Version}. - * <p/> + * * You may be before this the documentation of {@link Version} object... - * <h4>Version componant ordering</h4> + * <h1>Version componant ordering</h1> * We can compare only componants of same type. - * <p/> - * Number componants use natural number ordering (0<1<2,...) (see {@link Version.NumberVersionComponant}). - * <p/> + * + * Number componants use natural number ordering (0<1<2,...) (see {@link Version.NumberVersionComponant}). + * * String componants use {@code preRelease} flag order (preRelease is before any other string componant) then natural character ordering of the {@code lowerCase} componant value. (see {@link Version.StringVersionComponant}). - * <pre>alpha == Alpha, aa > rc</pre> - * <h4>Snapshot ordering</h4> + * <pre>alpha == Alpha, aa > rc</pre> + * <h2>Snapshot ordering</h2> * A {@code snapshot} version is before the exact same version without the flag. - * <pre>1.1-SNAPSHOT < 1.1</pre> - * <h4>General ordering algorithm</h4> + * <pre>1.1-SNAPSHOT < 1.1</pre> + * <h2>General ordering algorithm</h2> * We compare version componants at same position until there is a difference. - * <p/> + * * If common componants of version are both equals, have a look to the next componant of the longuest version * (if the version have the same componants size, Versions are equals!). - * <p/> + * * If the next componant is a number, the longuest version is after the other one: - * <pre>1 < 1.0</pre> + * <pre>1 < 1.0</pre> * If the next componant is a classifier, we consider the componant {@code preRelease} flag, * if setted then the longuest version is before the other one, if no, after: - * <pre>1-alpha < 1 < 1-aa</pre> - * <h4>Examples</h4> + * <pre>1-alpha < 1 < 1-aa</pre> + * <h2>Examples</h2> * Here is a list of ordered versions: * <pre> * 0-SNAPSHOT diff --git a/src/main/java/org/nuiton/util/version/VersionConverter.java b/src/main/java/org/nuiton/util/version/VersionConverter.java index 204267f..1eb62ee 100644 --- a/src/main/java/org/nuiton/util/version/VersionConverter.java +++ b/src/main/java/org/nuiton/util/version/VersionConverter.java @@ -30,7 +30,7 @@ import org.nuiton.converter.NuitonConverter; /** * To convert {@link Version} using {@link Converter} API. - * <p/> + * * Created on 7/11/14. * * @author Tony Chemit - chemit@codelutin.com diff --git a/src/main/java/org/nuiton/util/version/Versions.java b/src/main/java/org/nuiton/util/version/Versions.java index 2afd0ac..189a14d 100644 --- a/src/main/java/org/nuiton/util/version/Versions.java +++ b/src/main/java/org/nuiton/util/version/Versions.java @@ -164,14 +164,14 @@ public class Versions { /** * Creates a new version from this one incremented. - * <p/> + * * If the last componant is a number, then just increments this number; otherwise add a new * number componant with value 1. - * <p/> + * * Example: * <ul> - * <li>1 -> 2</li> - * <li>1-a -> 1-a.1</li> + * <li>1 → 2</li> + * <li>1-a → 1-a.1</li> * </ul> * * @return the incremented version @@ -185,14 +185,14 @@ public class Versions { /** * Creates a new version from this one incremented. - * <p/> + * * If the last componant is a number, then just increments this number; otherwise add a new * number componant with value 1. - * <p/> + * * Example: * <ul> - * <li>1 -> 2</li> - * <li>1-a -> 1-a.1</li> + * <li>1 → 2</li> + * <li>1-a → 1-a.1</li> * </ul> * * @param componantSeperator the componant separator to use the last componant is a classifier @@ -230,7 +230,7 @@ public class Versions { /** * Creates a new version from this one with the number componant incremented at the given position. - * <p/> + * * <strong>Note:</strong> * Will fail if the componant at the required position is not a number. * @@ -252,7 +252,7 @@ public class Versions { /** * Creates a new version from this one with the number componant decremented at the given position. - * <p/> + * * <strong>Note:</strong> * Will fail if the componant at the required position is not a number, or his value is 0. * diff --git a/src/test/java/org/nuiton/util/AliasMapTest.java b/src/test/java/org/nuiton/util/AliasMapTest.java index bacd411..4f90e8f 100644 --- a/src/test/java/org/nuiton/util/AliasMapTest.java +++ b/src/test/java/org/nuiton/util/AliasMapTest.java @@ -23,24 +23,22 @@ package org.nuiton.util; */ -import java.util.Arrays; -import java.util.Collection; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import java.util.Arrays; +import java.util.Collection; + /** - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @author Benjamin Poussin - poussin@codelutin.com */ public class AliasMapTest { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** + * Logger. + */ static private Log log = LogFactory.getLog(AliasMapTest.class); protected Object[] toArray(Collection c) { diff --git a/src/test/java/org/nuiton/util/CallAnalyseTest.java b/src/test/java/org/nuiton/util/CallAnalyseTest.java index 540ab8b..983e25a 100644 --- a/src/test/java/org/nuiton/util/CallAnalyseTest.java +++ b/src/test/java/org/nuiton/util/CallAnalyseTest.java @@ -20,17 +20,6 @@ * #L% */ -/* * - * CallAnalyseTest.java - * - * Created: 25 août 2005 21:03:50 CEST - * - * @author Benjamin POUSSIN <poussin@codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : */ - package org.nuiton.util; import junit.framework.TestCase; @@ -40,9 +29,16 @@ import org.apache.commons.logging.LogFactory; import java.util.ArrayList; import java.util.List; +/** + * Created: 25 août 2005 21:03:50 CEST + * + * @author Benjamin Poussin - poussin@codelutin.com + */ public class CallAnalyseTest extends TestCase { // CallAnalyseTest - /** Logger. */ + /** + * Logger. + */ static private Log log = LogFactory.getLog(CallAnalyseTest.class); protected List<List<?>> memoryConsume = new ArrayList<List<?>>(); diff --git a/src/test/java/org/nuiton/util/CardinalityHelperTest.java b/src/test/java/org/nuiton/util/CardinalityHelperTest.java index 4f96289..832727a 100644 --- a/src/test/java/org/nuiton/util/CardinalityHelperTest.java +++ b/src/test/java/org/nuiton/util/CardinalityHelperTest.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; /** * CardinalityHelper Tester. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @version 1.0 * @since <pre>12/17/2007</pre> */ diff --git a/src/test/java/org/nuiton/util/CategorisedListenerSetTest.java b/src/test/java/org/nuiton/util/CategorisedListenerSetTest.java index b770709..bf2e73b 100644 --- a/src/test/java/org/nuiton/util/CategorisedListenerSetTest.java +++ b/src/test/java/org/nuiton/util/CategorisedListenerSetTest.java @@ -20,23 +20,15 @@ * #L% */ -/******************************************************************************* - * CategorisedListenerSetTest.java - * - * Created: 3 janv. 2006 23:27:42 - * - * @author poussin - * - * @version $Revision$ - * - * Last update: $Date$ by : */ - package org.nuiton.util; import junit.framework.TestCase; -/** @author poussin */ - +/** + * Created: 3 janv. 2006 23:27:42 + * + * @author Benjamin Poussin - poussin@codelutin.com + */ public class CategorisedListenerSetTest extends TestCase { /* diff --git a/src/test/java/org/nuiton/util/CollectionUtilTest.java b/src/test/java/org/nuiton/util/CollectionUtilTest.java index 7f1a322..1c062d8 100644 --- a/src/test/java/org/nuiton/util/CollectionUtilTest.java +++ b/src/test/java/org/nuiton/util/CollectionUtilTest.java @@ -30,7 +30,7 @@ import java.util.List; /** * CollectionUtil Tester. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @version 1.0 * @since <pre>02/04/2008</pre> */ diff --git a/src/test/java/org/nuiton/util/FileUtilTest.java b/src/test/java/org/nuiton/util/FileUtilTest.java index 486e51d..9c2a00a 100644 --- a/src/test/java/org/nuiton/util/FileUtilTest.java +++ b/src/test/java/org/nuiton/util/FileUtilTest.java @@ -35,12 +35,10 @@ import java.util.List; import java.util.Map; /** - * FileUtilTest. - * <p/> * Created: 22 nov. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class FileUtilTest { // FileUtilTest @@ -108,7 +106,7 @@ public class FileUtilTest { // FileUtilTest /** * Test grep on a single file. - * <p/> + * <p> * Search for grep() method count. * * @throws IOException @@ -133,7 +131,7 @@ public class FileUtilTest { // FileUtilTest /** * Test grep on a multiple files. - * <p/> + * <p> * Try to find all java file containing "CodeLutin". Can fail if some * src files are deleted. * @@ -147,7 +145,7 @@ public class FileUtilTest { // FileUtilTest Map<File, List<CharSequence>> results = FileUtil.grep("CodeLutin", rootDir, ".*\\.java", "UTF-8"); Assert.assertTrue("should have more than 50 files, but found : " + - results.size(), results.size() > 50); + results.size(), results.size() > 50); } @@ -188,7 +186,7 @@ public class FileUtilTest { // FileUtilTest /** * Test sed on a multiple files. - * <p/> + * <p> * Try to replace all "CodeLutin" by "nuiton" in all files. Can fail if some * src files are deleted. * @@ -207,7 +205,7 @@ public class FileUtilTest { // FileUtilTest Map<File, List<CharSequence>> results = FileUtil.grep("CodeLutin", testDirectory, ".*\\.java", "UTF-8"); Assert.assertTrue("should have more than 50 files, but found : " + - results.size(), results.size() > 50); + results.size(), results.size() > 50); FileUtil.sed("CodeLutin", "Nuiton", testDirectory, ".*\\.java", "UTF-8"); @@ -216,7 +214,7 @@ public class FileUtilTest { // FileUtilTest results = FileUtil.grep("Nuiton", testDirectory, ".*\\.java", "UTF-8"); Assert.assertTrue("should have more than 50 files, but found : " + - results.size(), results.size() > 50); + results.size(), results.size() > 50); // clean diff --git a/src/test/java/org/nuiton/util/LRUMapMultiKeyTest.java b/src/test/java/org/nuiton/util/LRUMapMultiKeyTest.java index 8db7c62..361518f 100644 --- a/src/test/java/org/nuiton/util/LRUMapMultiKeyTest.java +++ b/src/test/java/org/nuiton/util/LRUMapMultiKeyTest.java @@ -20,26 +20,17 @@ * #L% */ -/* * - * LRUMapMultiKeyTest.java - * - * Created: 23 mai 2006 04:57:50 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : */ - package org.nuiton.util; import junit.framework.TestCase; import java.util.List; - -/** @author poussin */ - +/** + * Created: 23 mai 2006 04:57:50 + * + * @author Benjamin Poussin - poussin@codelutin.com + */ public class LRUMapMultiKeyTest extends TestCase { diff --git a/src/test/java/org/nuiton/util/ListenerSetTest.java b/src/test/java/org/nuiton/util/ListenerSetTest.java index ab22734..8eb4b0e 100644 --- a/src/test/java/org/nuiton/util/ListenerSetTest.java +++ b/src/test/java/org/nuiton/util/ListenerSetTest.java @@ -27,7 +27,7 @@ * * @author Benjamin Poussin <poussin@codelutin.com> * Copyright Code Lutin - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ diff --git a/src/test/java/org/nuiton/util/MD5InputStreamTest.java b/src/test/java/org/nuiton/util/MD5InputStreamTest.java index 23eda76..808f1a1 100644 --- a/src/test/java/org/nuiton/util/MD5InputStreamTest.java +++ b/src/test/java/org/nuiton/util/MD5InputStreamTest.java @@ -31,7 +31,7 @@ import java.io.*; import java.net.URL; /** - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public class MD5InputStreamTest { diff --git a/src/test/java/org/nuiton/util/MatrixMapTest.java b/src/test/java/org/nuiton/util/MatrixMapTest.java index bdb444c..a80fe01 100644 --- a/src/test/java/org/nuiton/util/MatrixMapTest.java +++ b/src/test/java/org/nuiton/util/MatrixMapTest.java @@ -37,15 +37,14 @@ */ package org.nuiton.util; +import org.junit.Test; + import java.util.Arrays; import java.util.List; -import org.junit.Assert; -import org.junit.Test; -import static org.junit.Assert.*; /** * - * @author poussin + * @author Benjamin Poussin - poussin@codelutin.com */ public class MatrixMapTest { diff --git a/src/test/java/org/nuiton/util/NumberUtilTest.java b/src/test/java/org/nuiton/util/NumberUtilTest.java index 00d51d3..43d6cea 100644 --- a/src/test/java/org/nuiton/util/NumberUtilTest.java +++ b/src/test/java/org/nuiton/util/NumberUtilTest.java @@ -28,7 +28,7 @@ import org.junit.Assert; import org.junit.Test; /** - * @author kmorin <kmorin@codelutin.com> + * @author Kevin Morin - morin@codelutin.com * @since 3.0 */ public class NumberUtilTest { diff --git a/src/test/java/org/nuiton/util/ObjectUtilTest.java b/src/test/java/org/nuiton/util/ObjectUtilTest.java index 3204d58..622c265 100644 --- a/src/test/java/org/nuiton/util/ObjectUtilTest.java +++ b/src/test/java/org/nuiton/util/ObjectUtilTest.java @@ -20,45 +20,33 @@ * #L% */ -/* * - * ObjectUtilTest.java - * - * Created: 19 nov. 07 12:39:28 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : */ - package org.nuiton.util; -import java.io.File; +import org.junit.Assert; +import org.junit.Test; +import java.io.File; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.List; -import org.junit.Assert; -import org.junit.Test; - /** - * @author poussin + * Created: 19 nov. 07 12:39:28 * + * @author Benjamin Poussin - poussin@codelutin.com */ public class ObjectUtilTest extends Assert { @Test public void testCall() throws Exception { Dummy dummy = new Dummy(); - + List<Method> methods = ObjectUtil.getMethod(Dummy.class, "setfile", true); assertEquals(1, methods.size()); ObjectUtil.call(dummy, methods.get(0), "/tmp"); assertEquals(new File("/tmp"), dummy.getFile()); - + methods = ObjectUtil.getMethod(Dummy.class, "setAllFile", true); assertEquals(1, methods.size()); ObjectUtil.call(dummy, methods.get(0), "toto", "/tmp", "/tmp/titi"); @@ -99,8 +87,8 @@ public class ObjectUtilTest extends Assert { Object o = ObjectUtil.create("java.lang.StringBuffer"); assertTrue(o != null); assertTrue(o instanceof StringBuffer); - - Dummy dummy = (Dummy)ObjectUtil.create( + + Dummy dummy = (Dummy) ObjectUtil.create( "org.nuiton.util.ObjectUtilTest$Dummy(name=\"coucou le monde\", file=/tmp/fileTest, integer=50)"); assertTrue(dummy != null); assertEquals("coucou le monde", dummy.getName()); @@ -117,13 +105,13 @@ public class ObjectUtilTest extends Assert { } catch (Exception e) { assertTrue(true); } - + assertEquals(false, ObjectUtil.getNullValue(boolean.class)); assertEquals(0, ObjectUtil.getNullValue(int.class)); - assertEquals((char)0, ObjectUtil.getNullValue(char.class)); + assertEquals((char) 0, ObjectUtil.getNullValue(char.class)); assertEquals(0f, ObjectUtil.getNullValue(float.class)); assertEquals(0d, ObjectUtil.getNullValue(double.class)); - assertEquals((byte)0, ObjectUtil.getNullValue(byte.class)); + assertEquals((byte) 0, ObjectUtil.getNullValue(byte.class)); assertNull(ObjectUtil.getNullValue(Boolean.class)); assertNull(ObjectUtil.getNullValue(Integer.class)); @@ -143,14 +131,14 @@ public class ObjectUtilTest extends Assert { assertTrue(ObjectUtil.isNullValue((char) 0)); assertTrue(ObjectUtil.isNullValue(0f)); assertTrue(ObjectUtil.isNullValue(0d)); - assertTrue(ObjectUtil.isNullValue((byte)0)); + assertTrue(ObjectUtil.isNullValue((byte) 0)); assertFalse(ObjectUtil.isNullValue(Boolean.FALSE)); assertFalse(ObjectUtil.isNullValue(Integer.valueOf(0))); assertFalse(ObjectUtil.isNullValue(Character.valueOf((char) 0))); assertFalse(ObjectUtil.isNullValue(Float.valueOf(0))); assertFalse(ObjectUtil.isNullValue(Double.valueOf(0))); - assertFalse(ObjectUtil.isNullValue(Byte.valueOf((byte)0))); + assertFalse(ObjectUtil.isNullValue(Byte.valueOf((byte) 0))); } public static class Dummy { @@ -164,11 +152,11 @@ public class ObjectUtilTest extends Assert { return allFile; } - public void setAllFile(String name, File ... allFile) { + public void setAllFile(String name, File... allFile) { this.name = name; this.allFile = allFile; } - + /** * @return the file */ diff --git a/src/test/java/org/nuiton/util/PagerBeanUtilTest.java b/src/test/java/org/nuiton/util/PagerBeanUtilTest.java index 847bda6..08e58d0 100644 --- a/src/test/java/org/nuiton/util/PagerBeanUtilTest.java +++ b/src/test/java/org/nuiton/util/PagerBeanUtilTest.java @@ -29,7 +29,7 @@ import org.junit.Test; /** * Test {@link PagerBeanUtil}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.6.6 */ public class PagerBeanUtilTest { diff --git a/src/test/java/org/nuiton/util/RecursivePropertiesTest.java b/src/test/java/org/nuiton/util/RecursivePropertiesTest.java index a7e766b..0be6157 100644 --- a/src/test/java/org/nuiton/util/RecursivePropertiesTest.java +++ b/src/test/java/org/nuiton/util/RecursivePropertiesTest.java @@ -22,20 +22,17 @@ package org.nuiton.util; -import java.io.FileInputStream; -import java.io.IOException; - import org.junit.Assert; import org.junit.Test; +import java.io.FileInputStream; +import java.io.IOException; + /** * Test recursives properties class. * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class RecursivePropertiesTest { /** diff --git a/src/test/java/org/nuiton/util/ReflectUtilTest.java b/src/test/java/org/nuiton/util/ReflectUtilTest.java index 4e738f0..81ce274 100644 --- a/src/test/java/org/nuiton/util/ReflectUtilTest.java +++ b/src/test/java/org/nuiton/util/ReflectUtilTest.java @@ -33,7 +33,7 @@ import java.util.Set; /** * To test the class {@link ReflectUtil}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.0 */ public class ReflectUtilTest { diff --git a/src/test/java/org/nuiton/util/ResourceTest.java b/src/test/java/org/nuiton/util/ResourceTest.java index 32a49c1..14cfed4 100644 --- a/src/test/java/org/nuiton/util/ResourceTest.java +++ b/src/test/java/org/nuiton/util/ResourceTest.java @@ -40,7 +40,7 @@ import java.util.List; * Test class for {@link Resource}. * * @author chatellier - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class ResourceTest { // ResourceTest diff --git a/src/test/java/org/nuiton/util/ReverseFileReaderTest.java b/src/test/java/org/nuiton/util/ReverseFileReaderTest.java index 2535042..1ab31dc 100644 --- a/src/test/java/org/nuiton/util/ReverseFileReaderTest.java +++ b/src/test/java/org/nuiton/util/ReverseFileReaderTest.java @@ -22,21 +22,17 @@ package org.nuiton.util; -import java.io.IOException; -import java.net.URL; - import org.junit.Assert; - import org.junit.Test; +import java.io.IOException; +import java.net.URL; + /** * Test for reverse reader utility. * * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : */ + */ public class ReverseFileReaderTest { /** diff --git a/src/test/java/org/nuiton/util/SemVerTest.java b/src/test/java/org/nuiton/util/SemVerTest.java index 693e567..112f44b 100644 --- a/src/test/java/org/nuiton/util/SemVerTest.java +++ b/src/test/java/org/nuiton/util/SemVerTest.java @@ -31,17 +31,15 @@ import org.junit.Test; import java.util.Arrays; /** - * @author poussin - * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : $Author$ + * @author Benjamin Poussin - poussin@codelutin.com * @deprecated since 3.0 (use now {@link org.nuiton.util.version.SemVerTest}. */ @Deprecated public class SemVerTest { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** + * Logger. + */ static private Log log = LogFactory.getLog(SemVerTest.class); /** @@ -128,9 +126,9 @@ public class SemVerTest { for (int i = 1; i < testIncValue.length; i++) { SemVer version = new SemVer(testIncValue[i][0]); Assert.assertEquals(String.format( - "Le nombre de composante doit correspondre au nombre de test a faire %s", - Arrays.toString(testIncValue[i])), - testIncValue[i].length - 1, version.getVersionCount()); + "Le nombre de composante doit correspondre au nombre de test a faire %s", + Arrays.toString(testIncValue[i])), + testIncValue[i].length - 1, version.getVersionCount()); for (int x = 1; x < testIncValue[i].length; x++) { SemVer expected = new SemVer(testIncValue[i][x]); SemVer inc = SemVer.creator(version).incVersion(x - 1, 1).done(); @@ -191,9 +189,9 @@ public class SemVerTest { int expected = -1; Assert.assertTrue(String.format( - "Bad compare: Compare(%s, %s) = %s, expected %s", - vi, vj, result, expected), - expected == result); + "Bad compare: Compare(%s, %s) = %s, expected %s", + vi, vj, result, expected), + expected == result); // System.out.println(String.format( // "Good compare: Compare(%s, %s) = %s, expected %s", // vi, vj, result, expected)); @@ -210,9 +208,9 @@ public class SemVerTest { int expected = Integer.valueOf(i).compareTo(j); // AThimel 2013/02/26 Rewritten for JDK6 compatibility. Was: Integer.compare(i, j); Assert.assertTrue(String.format( - "Bad compare: Compare(%s, %s) = %s, expected %s", - vi, vj, result, expected), - expected == result); + "Bad compare: Compare(%s, %s) = %s, expected %s", + vi, vj, result, expected), + expected == result); } } } diff --git a/src/test/java/org/nuiton/util/StringUtilTest.java b/src/test/java/org/nuiton/util/StringUtilTest.java index 7a5f1b4..cbf4719 100644 --- a/src/test/java/org/nuiton/util/StringUtilTest.java +++ b/src/test/java/org/nuiton/util/StringUtilTest.java @@ -26,24 +26,24 @@ * Created: 7 oct. 2004 * * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ + * * * Mise a jour: $Date$ * par : */ package org.nuiton.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import org.junit.Assert; +import org.junit.Test; import java.awt.Color; import java.util.Arrays; import java.util.Locale; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class StringUtilTest { private static final String[] EMPTY_STRING_ARRAY = new String[0]; // StringUtilTest diff --git a/src/test/java/org/nuiton/util/TransparenteReferenceTest.java b/src/test/java/org/nuiton/util/TransparenteReferenceTest.java index f804051..df2d8cc 100644 --- a/src/test/java/org/nuiton/util/TransparenteReferenceTest.java +++ b/src/test/java/org/nuiton/util/TransparenteReferenceTest.java @@ -20,17 +20,6 @@ * #L% */ -/* * - * TransparenteReferenceTest.java - * - * Created: 22 mai 2006 15:41:49 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : */ - package org.nuiton.util; import junit.framework.TestCase; @@ -39,8 +28,11 @@ import java.util.HashMap; import java.util.Map; -/** @author poussin */ - +/** + * Created: 22 mai 2006 15:41:49 + * + * @author Benjamin Poussin - poussin@codelutin.com + */ public class TransparenteReferenceTest extends TestCase { public void testHash() { diff --git a/src/test/java/org/nuiton/util/VersionTest.java b/src/test/java/org/nuiton/util/VersionTest.java index 96d47b5..cb6f3a1 100644 --- a/src/test/java/org/nuiton/util/VersionTest.java +++ b/src/test/java/org/nuiton/util/VersionTest.java @@ -22,17 +22,20 @@ package org.nuiton.util; +import org.junit.Test; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Test; -import static org.nuiton.util.VersionUtilTest.*; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.nuiton.util.VersionUtilTest.VERSIONS; +import static org.nuiton.util.VersionUtilTest.compareVersions; /** * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1.0 * @deprecated since 3.0 (use now {@link org.nuiton.util.version.VersionTest}). */ diff --git a/src/test/java/org/nuiton/util/VersionUtilTest.java b/src/test/java/org/nuiton/util/VersionUtilTest.java index 7ae5f28..983af76 100644 --- a/src/test/java/org/nuiton/util/VersionUtilTest.java +++ b/src/test/java/org/nuiton/util/VersionUtilTest.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1.0 * @deprecated since 3.0 (use now {@link org.nuiton.util.version.VersionTest}). */ diff --git a/src/test/java/org/nuiton/util/ZipUtilTest.java b/src/test/java/org/nuiton/util/ZipUtilTest.java index 0ac434d..999d5ad 100644 --- a/src/test/java/org/nuiton/util/ZipUtilTest.java +++ b/src/test/java/org/nuiton/util/ZipUtilTest.java @@ -38,23 +38,19 @@ import java.util.Collections; import java.util.List; /** - * ZipUtilTest.java - * <p/> * Created: 24 août 2006 10:47:21 * - * @author poussin - * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : + * @author Benjamin Poussin - poussin@codelutin.com */ public class ZipUtilTest { - /** Logger. */ + /** + * Logger. + */ private static Log log = LogFactory.getLog(ZipUtilTest.class); protected static final File DIR = new File(System.getProperty("java.home"), - "bin"); + "bin"); protected static File testWorkDir; @@ -71,8 +67,8 @@ public class ZipUtilTest { } File basedirFile = new File(basedir); testWorkDir = new File(basedirFile, - "target" + File.separator + - "surefire-workdir"); + "target" + File.separator + + "surefire-workdir"); boolean b = testWorkDir.exists() || testWorkDir.mkdirs(); if (!b) { @@ -81,10 +77,10 @@ public class ZipUtilTest { } testResourcesDir = new File(basedirFile, - "src" + File.separator + - "test" + File.separator + - "resources" + File.separator + - "zip"); + "src" + File.separator + + "test" + File.separator + + "resources" + File.separator + + "zip"); } protected File createTempFile(String prefix, String suffix) throws IOException { diff --git a/src/test/java/org/nuiton/util/beans/BeanC.java b/src/test/java/org/nuiton/util/beans/BeanC.java index cee9207..86041fe 100644 --- a/src/test/java/org/nuiton/util/beans/BeanC.java +++ b/src/test/java/org/nuiton/util/beans/BeanC.java @@ -27,7 +27,7 @@ import java.beans.PropertyChangeSupport; /** * To test http://nuiton.org/issues/2178. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5.1 */ public class BeanC { diff --git a/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java b/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java index 3ed9aee..fc20711 100644 --- a/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java +++ b/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java @@ -29,8 +29,8 @@ import java.util.Map; /** * Tests {@link BeanMonitor}. * - * @author tchemit <chemit@codelutin.com> - * @serial $Id$ + * @author Tony Chemit - chemit@codelutin.com + * @serial * @since 1.4.1 */ public class BeanMonitorTest { diff --git a/src/test/java/org/nuiton/util/beans/BeanUtilTest.java b/src/test/java/org/nuiton/util/beans/BeanUtilTest.java index f7351c0..f135816 100644 --- a/src/test/java/org/nuiton/util/beans/BeanUtilTest.java +++ b/src/test/java/org/nuiton/util/beans/BeanUtilTest.java @@ -37,7 +37,7 @@ import java.util.Set; /** * To test the {@link BeanUtil} class. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.0 */ public class BeanUtilTest { diff --git a/src/test/java/org/nuiton/util/beans/BinderFactoryTest.java b/src/test/java/org/nuiton/util/beans/BinderFactoryTest.java index 635fb52..516917f 100644 --- a/src/test/java/org/nuiton/util/beans/BinderFactoryTest.java +++ b/src/test/java/org/nuiton/util/beans/BinderFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link BinderFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.5.3 */ diff --git a/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java b/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java index 178983d..685825b 100644 --- a/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java +++ b/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Tests the {@link BinderModelBuilder}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.5.3 */ public class BinderModelBuilderTest { @@ -71,7 +71,7 @@ public class BinderModelBuilderTest { Assert.assertTrue(true); } - // A --> A + // A → A builderAA = BinderModelBuilder.newEmptyBuilder(BeanA.class); assertBuilder(builderAA, BeanA.class, BeanA.class); @@ -123,7 +123,7 @@ public class BinderModelBuilderTest { BeanA.PROPERTY_F ); - // A --> B + // A → B builderAB = BinderModelBuilder.newEmptyBuilder(BeanA.class, BeanB.class); assertBuilder(builderAB, BeanA.class, BeanB.class); @@ -157,7 +157,7 @@ public class BinderModelBuilderTest { BeanB.PROPERTY_F2 ); - // B --> B + // B → B builderBB = BinderModelBuilder.newEmptyBuilder(BeanB.class); assertBuilder(builderBB, BeanB.class, BeanB.class); @@ -235,7 +235,7 @@ public class BinderModelBuilderTest { BeanB.PROPERTY_F2 ); - // B --> A + // B → A builderBA = BinderModelBuilder.newEmptyBuilder(BeanB.class, BeanA.class); assertBuilder(builderBA, BeanB.class, BeanA.class); @@ -296,7 +296,7 @@ public class BinderModelBuilderTest { Assert.assertTrue(true); } - // A --> A + // A → A builderAA = BinderModelBuilder.newDefaultBuilder(BeanA.class); assertBuilder(builderAA, BeanA.class, BeanA.class); @@ -320,7 +320,7 @@ public class BinderModelBuilderTest { BeanA.PROPERTY_F ); - // A --> B + // A → B builderAB = BinderModelBuilder.newDefaultBuilder(BeanA.class, BeanB.class); assertBuilder(builderAB, BeanA.class, BeanB.class); @@ -333,7 +333,7 @@ public class BinderModelBuilderTest { BeanA.PROPERTY_F ); - // B --> B + // B → B builderBB = BinderModelBuilder.newDefaultBuilder(BeanB.class); assertBuilder(builderBB, BeanB.class, BeanB.class); @@ -370,7 +370,7 @@ public class BinderModelBuilderTest { BeanB.PROPERTY_F2 ); - // B --> A + // B → A builderBA = BinderModelBuilder.newDefaultBuilder(BeanB.class, BeanA.class); assertBuilder(builderBA, BeanB.class, BeanA.class); @@ -562,7 +562,7 @@ public class BinderModelBuilderTest { // This is test for http://nuiton.org/issues/1913 - // A --> AA + // A → AA BinderModelBuilder<BeanA, BeanAA> builderAAA; diff --git a/src/test/java/org/nuiton/util/beans/BinderTest.java b/src/test/java/org/nuiton/util/beans/BinderTest.java index dc47bfd..b2daae4 100644 --- a/src/test/java/org/nuiton/util/beans/BinderTest.java +++ b/src/test/java/org/nuiton/util/beans/BinderTest.java @@ -60,7 +60,7 @@ public class BinderTest { // remove all previous models from the factory BinderFactory.clear(); - // creates a mirrored binder model from A -> A with only one property + // creates a mirrored binder model from A → A with only one property BinderModelBuilder<BeanA, BeanA> builder = BinderModelBuilder.newEmptyBuilder(BeanA.class). @@ -69,7 +69,7 @@ public class BinderTest { // register the model into factory BinderFactory.registerBinderModel(builder); - // creates a binder model from A -> B with more properties + // creates a binder model from A → B with more properties BinderModelBuilder<BeanA, BeanB> builder1 = BinderModelBuilder.newEmptyBuilder(BeanA.class, BeanB.class). @@ -80,7 +80,7 @@ public class BinderTest { // register the model into factory BinderFactory.registerBinderModel(builder1); - // creates a binder model from A -> B with more properties + // creates a binder model from A → B with more properties BinderModelBuilder<BeanC, BeanC> builder2 = BinderModelBuilder.newEmptyBuilder(BeanC.class, BeanC.class). @@ -103,13 +103,13 @@ public class BinderTest { @Before public void setUp() { - // get the binder A -> A + // get the binder A → A binderA = BinderFactory.newBinder(BeanA.class); - // get the binder A -> B + // get the binder A → B binderB = BinderFactory.newBinder(BeanA.class, BeanB.class); - // get the binder C -> C + // get the binder C → C binderC = BinderFactory.newBinder(BeanC.class); a = new BeanA(); diff --git a/src/test/java/org/nuiton/util/converter/ConverterUtilTest.java b/src/test/java/org/nuiton/util/converter/ConverterUtilTest.java index 2c1245d..d9b5d04 100644 --- a/src/test/java/org/nuiton/util/converter/ConverterUtilTest.java +++ b/src/test/java/org/nuiton/util/converter/ConverterUtilTest.java @@ -31,7 +31,7 @@ import org.nuiton.util.Version; /** * ConverterUtil Tester. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @version 1.3 (replace class {@code org.nuiton.util.ConverterUtilTest}). * @since <pre>02/13/2008</pre> */ diff --git a/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java b/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java index a29b0a3..db6b182 100644 --- a/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java +++ b/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java @@ -27,7 +27,7 @@ import org.apache.commons.beanutils.Converter; /** * A converter with no getType method, so not registreable via {@link ConverterUtil#initConverters()} * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 (replace class {@code org.nuiton.util.UnregistreableConverter}). */ @Deprecated diff --git a/src/test/java/org/nuiton/util/converter/VersionConverterTest.java b/src/test/java/org/nuiton/util/converter/VersionConverterTest.java index 500c52f..39018a1 100644 --- a/src/test/java/org/nuiton/util/converter/VersionConverterTest.java +++ b/src/test/java/org/nuiton/util/converter/VersionConverterTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.*; /** * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.3 (replace class {@code org.nuiton.util.VersionConverterTest}). */ @Deprecated diff --git a/src/test/java/org/nuiton/util/rmi/AnyException.java b/src/test/java/org/nuiton/util/rmi/AnyException.java index 7ea0519..7f9b62c 100644 --- a/src/test/java/org/nuiton/util/rmi/AnyException.java +++ b/src/test/java/org/nuiton/util/rmi/AnyException.java @@ -22,7 +22,7 @@ package org.nuiton.util.rmi; /** - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public class AnyException extends Exception { diff --git a/src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java b/src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java index 3d443ad..1df6b89 100644 --- a/src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java +++ b/src/test/java/org/nuiton/util/rmi/RmiExporterAndProxyTest.java @@ -26,13 +26,12 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import org.junit.Ignore; import java.io.InvalidObjectException; import java.rmi.NotBoundException; /** - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ @Ignore public class RmiExporterAndProxyTest { diff --git a/src/test/java/org/nuiton/util/rmi/SomeBean.java b/src/test/java/org/nuiton/util/rmi/SomeBean.java index dc44cc0..8ab7109 100644 --- a/src/test/java/org/nuiton/util/rmi/SomeBean.java +++ b/src/test/java/org/nuiton/util/rmi/SomeBean.java @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.Date; /** - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public class SomeBean implements Serializable { diff --git a/src/test/java/org/nuiton/util/rmi/SomeService.java b/src/test/java/org/nuiton/util/rmi/SomeService.java index eae736d..b1fc8ab 100644 --- a/src/test/java/org/nuiton/util/rmi/SomeService.java +++ b/src/test/java/org/nuiton/util/rmi/SomeService.java @@ -24,7 +24,7 @@ package org.nuiton.util.rmi; /** * Any service interface which will be used to test the RMI proxy. * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public interface SomeService { diff --git a/src/test/java/org/nuiton/util/rmi/SomeServiceImpl.java b/src/test/java/org/nuiton/util/rmi/SomeServiceImpl.java index dc7f56d..61679c4 100644 --- a/src/test/java/org/nuiton/util/rmi/SomeServiceImpl.java +++ b/src/test/java/org/nuiton/util/rmi/SomeServiceImpl.java @@ -24,7 +24,7 @@ package org.nuiton.util.rmi; import java.io.InvalidObjectException; /** - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel - thimel@codelutin.com */ public class SomeServiceImpl implements SomeService { diff --git a/src/test/java/org/nuiton/util/version/SemVerTest.java b/src/test/java/org/nuiton/util/version/SemVerTest.java index b10ff63..3ddaf15 100644 --- a/src/test/java/org/nuiton/util/version/SemVerTest.java +++ b/src/test/java/org/nuiton/util/version/SemVerTest.java @@ -29,11 +29,7 @@ import org.junit.Test; import java.util.Arrays; /** - * @author poussin - * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : $Author$ + * @author Benjamin Poussin - poussin@codelutin.com */ public class SemVerTest { @@ -121,9 +117,9 @@ public class SemVerTest { for (int i = 1; i < testIncValue.length; i++) { SemVer version = new SemVer(testIncValue[i][0]); Assert.assertEquals(String.format( - "Le nombre de composante doit correspondre au nombre de test a faire %s", - Arrays.toString(testIncValue[i])), - testIncValue[i].length - 1, version.getVersionCount()); + "Le nombre de composante doit correspondre au nombre de test a faire %s", + Arrays.toString(testIncValue[i])), + testIncValue[i].length - 1, version.getVersionCount()); for (int x = 1; x < testIncValue[i].length; x++) { SemVer expected = new SemVer(testIncValue[i][x]); SemVer inc = SemVer.creator(version).incVersion(x - 1, 1).done(); @@ -184,9 +180,9 @@ public class SemVerTest { int expected = -1; Assert.assertTrue(String.format( - "Bad compare: Compare(%s, %s) = %s, expected %s", - vi, vj, result, expected), - expected == result); + "Bad compare: Compare(%s, %s) = %s, expected %s", + vi, vj, result, expected), + expected == result); // System.out.println(String.format( // "Good compare: Compare(%s, %s) = %s, expected %s", // vi, vj, result, expected)); @@ -203,9 +199,9 @@ public class SemVerTest { int expected = Integer.valueOf(i).compareTo(j); // AThimel 2013/02/26 Rewritten for JDK6 compatibility. Was: Integer.compare(i, j); Assert.assertTrue(String.format( - "Bad compare: Compare(%s, %s) = %s, expected %s", - vi, vj, result, expected), - expected == result); + "Bad compare: Compare(%s, %s) = %s, expected %s", + vi, vj, result, expected), + expected == result); } } } diff --git a/src/test/resources/org/nuiton/util/fileUtilData.txt b/src/test/resources/org/nuiton/util/fileUtilData.txt index 511bc30..c15700d 100644 --- a/src/test/resources/org/nuiton/util/fileUtilData.txt +++ b/src/test/resources/org/nuiton/util/fileUtilData.txt @@ -77,7 +77,7 @@ import java.util.regex.Pattern; * temporaire, comparaison de dates de création, récupération d'une chaîne, * d'un Reader ou d'un Writer à partir d'un fichier, récupération du fichier * saisi dans une boîte de dialogue, conversions en byte[], en Stream... - * <p/> + * * Created: 22 novembre 2004 * * @author bpoussin <poussin@codelutin.com> @@ -616,7 +616,7 @@ public class FileUtil { // FileUtil /** * Equivalent de la methode basename unix. - * basename("/tmp/toto.xml", ".xml") -> "toto" + * 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 @@ -630,7 +630,7 @@ public class FileUtil { // FileUtil /** * Equivalent de la methode basename unix. - * basename("/tmp/toto.xml", ".xml") -> "toto" + * basename("/tmp/toto.xml", ".xml") → "toto" * * @param name le nom du fichier dont on souhaite le nom sans le chemin * @param suffixes si present represente le suffixe a eliminer du fichier @@ -979,7 +979,7 @@ public class FileUtil { // FileUtil /** * Copie recursivement le repertoire source dans le repertoire destination - * <p/> + * * copyRecursively("/truc/titi", "/var/tmp") donnera le repertoire * "/var/tmp/titi" * @@ -997,7 +997,7 @@ public class FileUtil { // FileUtil /** * Copie recursivement le repertoire source dans le repertoire destination - * <p/> + * * copyRecursively("/truc/titi", "/var/tmp", "bidulle") donnera le repertoire * "/var/tmp/bidulle", 'bidulle' remplacant 'titi' * @@ -1026,7 +1026,7 @@ public class FileUtil { // FileUtil /** * Copie recursivement le repertoire source dans le repertoire destination - * <p/> + * * copyRecursively("/truc/titi", "/var/tmp", "bidulle") donnera le repertoire * "/var/tmp/bidulle", 'bidulle' remplacant 'titi' * @@ -1064,7 +1064,7 @@ public class FileUtil { // FileUtil if (renameFrom != null && renameTo != null) { String tmp = path.replaceAll(renameFrom, renameTo); if (log.isDebugEnabled()) { - log.debug("rename " + path + " -> " + tmp); + log.debug("rename " + path + " → " + tmp); } path = tmp; } @@ -1379,7 +1379,7 @@ public class FileUtil { // FileUtil /** * Obtain a file from the given {@code rootDirectory}, applying given paths. - * <p/> + * * For example with paths = a, b and c, then result is : * <pre> * root/a/b/c @@ -1400,7 +1400,7 @@ public class FileUtil { // FileUtil /** * Obtain a file fro the given {@code rootDirectory}, applying the fqn. - * <p/> + * * For example with fqn = a.b.c, the result is : * <pre> * root/a/b/c -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.