diff --git a/config/sun_checks.xml b/config/sun_checks.xml
index 53366b3b8e840010510a4ed9458208890c681dc8..5168d217928c410beb3d6253994c56d8bb2735fb 100644
--- a/config/sun_checks.xml
+++ b/config/sun_checks.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-		  "-//Checkstyle//DTD Check Configuration 1.3//EN"
+		  "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
 		  "https://checkstyle.org/dtds/configuration_1_3.dtd">
-<!-- This is a checkstyle configuration file derived from Sun coding conventions. 
-	For descriptions of what the following rules do, please see the checkstyle 
+<!-- This is a checkstyle configuration file derived from Sun coding conventions.
+	For descriptions of what the following rules do, please see the checkstyle
 	configuration page at http://checkstyle.sourceforge.net/config.html -->
 
 
@@ -11,24 +11,25 @@
 
   Checkstyle configuration that checks the sun coding conventions from:
 
-  - the Java Language Specification at
-    http://java.sun.com/docs/books/jls/second_edition/html/index.html
+    - the Java Language Specification at
+      https://docs.oracle.com/javase/specs/jls/se11/html/index.html
 
-  - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+    - the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
 
-  - the Javadoc guidelines at
-   http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+    - the Javadoc guidelines at
+      https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
 
-  - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+    - the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
 
- - some best practices
+    - some best practices
 
   Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
+  https://checkstyle.org (or in your downloaded distribution).
 
   Most Checks are configurable, be sure to consult the documentation.
 
   To completely disable a check, just comment it out or delete it from the file.
+  To suppress certain violations please review suppression filters.
 
   Finally, it is worth reading the documentation.
 
@@ -37,46 +38,50 @@
 	<!--
 		If you set the basedir property below, then all reported file
 		names will be relative to the specified directory. See
-		http://checkstyle.sourceforge.net/5.x/config.html#Checker
+		https://checkstyle.org/config.html#Checker
 
 		<property name="basedir" value="${basedir}"/>
 	-->
+	<property name="severity" value="error"/>
 
-	<!--
-	-->
 	<property name="fileExtensions" value="java, xml"/>
 
-	<!-- Checks that a package-info.java file exists for each package. -->
-	<!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
+	<!-- https://checkstyle.org/filters/suppressionfilter.html -->
+	<module name="SuppressionFilter">
+		<property name="file"
+			value="${basedir}/config/checkstyle-suppressions.xml" />
+		<property name="optional" value="false"/>
+	</module>
+	<module name="SuppressWarningsFilter" />
+
+	<!-- Checks that a package-info.java file exists for each package.     -->
+	<!-- See https://checkstyle.org/checks/javadoc/javadocpackage.html#JavadocPackage -->
 	<module name="JavadocPackage" />
 
-	<!-- Checks whether files end with a new line. -->
-	<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+	<!-- Checks whether files end with a new line.                        -->
+	<!-- See https://checkstyle.org/checks/misc/newlineatendoffile.html -->
 	<module name="NewlineAtEndOfFile" />
 
-	<!-- Checks that property files contain the same keys. -->
-	<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+	<!-- Checks that property files contain the same keys.         -->
+	<!-- See https://checkstyle.org/checks/misc/translation.html -->
 	<module name="Translation" />
 
-	<!-- Checks for Size Violations. -->
-	<!-- See http://checkstyle.sf.net/config_sizes.html -->
+	<!-- Checks for Size Violations.                    -->
+	<!-- See https://checkstyle.org/checks/sizes/index.html -->
 	<module name="FileLength" />
-
-	<!-- Checks for whitespace -->
-	<!-- See http://checkstyle.sf.net/config_whitespace.html -->
-	<module name="FileTabCharacter">
-		<property name="fileExtensions" value="java" />
-	</module>
-
-	<!-- https://checkstyle.sourceforge.io/config_sizes.html#LineLength -->
 	<module name="LineLength">
 		<property name="fileExtensions" value="java"/>
+		<!-- Added to Sun convention: -->
 		<property name="ignorePattern" value="^import " />
 		<property name="max" value="120" />
 	</module>
-  
-	<!-- Miscellaneous other checks. -->
-	<!-- See http://checkstyle.sf.net/config_misc.html -->
+
+	<!-- Checks for whitespace                               -->
+	<!-- See https://checkstyle.org/checks/whitespace/index.html -->
+	<module name="FileTabCharacter" />
+
+	<!-- Miscellaneous other checks.                   -->
+	<!-- See https://checkstyle.org/checks/misc/index.html -->
 	<module name="RegexpSingleline">
 		<property name="format" value="\s+$" />
 		<property name="minimum" value="0" />
@@ -84,35 +89,25 @@
 		<property name="message" value="Line has trailing spaces." />
 	</module>
 
-	<module name="SuppressionFilter">
-		<property name="file"
-			value="${basedir}/config/checkstyle-suppressions.xml" />
-	</module>
-
-	<!-- Adding to Sun convention: -->
-	<module name="SuppressWarningsFilter" />
-	<!-- <module name="SuppressionCommentFilter"> <property name="offCommentFormat" 
-		value="CHECKSTYLE.OFF\: ([\w\|]+)" /> <property name="onCommentFormat" value="CHECKSTYLE.ON\: 
-		([\w\|]+)" /> <property name="checkFormat" value="$1" /> </module> -->
-
-	<!-- Checks for Headers -->
-	<!-- See http://checkstyle.sf.net/config_header.html -->
+	<!-- Checks for Headers                                -->
+	<!-- See https://checkstyle.org/checks/header/index.html   -->
 	<!-- <module name="Header"> -->
 	<!-- <property name="headerFile" value="${checkstyle.header.file}"/> -->
 	<!-- <property name="fileExtensions" value="java"/> -->
 	<!-- </module> -->
 	<module name="TreeWalker">
 
-		<!-- Checks for Javadoc comments. -->
-		<!-- See http://checkstyle.sf.net/config_javadoc.html -->
+		<!-- Checks for Javadoc comments.                     -->
+		<!-- See https://checkstyle.org/checks/javadoc/index.html -->
+		<module name="InvalidJavadocPosition"/>
 		<module name="JavadocMethod" />
 		<module name="JavadocType" />
 		<module name="JavadocVariable" />
 		<module name="JavadocStyle" />
+		<module name="MissingJavadocMethod"/>
 
-
-		<!-- Checks for Naming Conventions. -->
-		<!-- See http://checkstyle.sf.net/config_naming.html -->
+		<!-- Checks for Naming Conventions.                  -->
+		<!-- See https://checkstyle.org/checks/naming/index.html -->
 		<module name="ConstantName" />
 		<module name="LocalFinalVariableName" />
 		<module name="LocalVariableName" />
@@ -123,24 +118,23 @@
 		<module name="StaticVariableName" />
 		<module name="TypeName" />
 
-
-		<!-- Checks for imports -->
-		<!-- See http://checkstyle.sf.net/config_import.html -->
+		<!-- Checks for imports                              -->
+		<!-- See https://checkstyle.org/checks/imports/index.html -->
 		<module name="AvoidStarImport" />
 		<module name="IllegalImport" /> <!-- defaults to sun.* packages -->
 		<module name="RedundantImport" />
 		<module name="UnusedImports" />
 
 
-		<!-- Checks for Size Violations. -->
-		<!-- See http://checkstyle.sf.net/config_sizes.html -->
+		<!-- Checks for Size Violations.                    -->
+		<!-- See https://checkstyle.org/checks/sizes/index.html -->
 		<module name="MethodLength" />
 		<module name="ParameterNumber">
-	        <property name="max" value="9"/>
+			<property name="max" value="9"/>
 		</module>
 
-		<!-- Checks for whitespace -->
-		<!-- See http://checkstyle.sf.net/config_whitespace.html -->
+		<!-- Checks for whitespace                               -->
+		<!-- See https://checkstyle.org/checks/whitespace/index.html -->
 		<module name="EmptyForIteratorPad" />
 		<module name="GenericWhitespace" />
 		<module name="MethodParamPad" />
@@ -152,24 +146,21 @@
 		<module name="WhitespaceAfter" />
 		<module name="WhitespaceAround" />
 
-
-		<!-- Modifier Checks -->
-		<!-- See http://checkstyle.sf.net/config_modifiers.html -->
+		<!-- Modifier Checks                                    -->
+		<!-- See https://checkstyle.org/checks/modifier/index.html -->
 		<module name="ModifierOrder" />
 		<module name="RedundantModifier" />
 
-
-		<!-- Checks for blocks. You know, those {}'s -->
-		<!-- See http://checkstyle.sf.net/config_blocks.html -->
+		<!-- Checks for blocks. You know, those {}'s         -->
+		<!-- See https://checkstyle.org/checks/blocks/index.html -->
 		<module name="AvoidNestedBlocks" />
 		<module name="EmptyBlock" />
 		<module name="LeftCurly" />
 		<module name="NeedBraces" />
 		<module name="RightCurly" />
 
-
-		<!-- Checks for common coding problems -->
-		<!-- See http://checkstyle.sf.net/config_coding.html -->
+		<!-- Checks for common coding problems               -->
+		<!-- See https://checkstyle.org/checks/coding/index.html -->
 		<module name="AvoidInlineConditionals" />
 		<module name="EmptyStatement" />
 		<module name="EqualsHashCode" />
@@ -178,26 +169,26 @@
 		<module name="InnerAssignment" />
 		<module name="MagicNumber" />
 		<module name="MissingSwitchDefault" />
+		<module name="MultipleVariableDeclarations"/>
 		<module name="SimplifyBooleanExpression" />
 		<module name="SimplifyBooleanReturn" />
 
-		<!-- Checks for class design -->
-		<!-- See http://checkstyle.sf.net/config_design.html -->
+		<!-- Checks for class design                         -->
+		<!-- See https://checkstyle.org/checks/design/index.html -->
 		<module name="DesignForExtension" />
 		<module name="FinalClass" />
 		<module name="HideUtilityClassConstructor" />
 		<module name="InterfaceIsType" />
 		<module name="VisibilityModifier" />
 
-
-		<!-- Miscellaneous other checks. -->
-		<!-- See http://checkstyle.sf.net/config_misc.html -->
+		<!-- Miscellaneous other checks.                   -->
+		<!-- See https://checkstyle.org/checks/misc/index.html -->
 		<module name="ArrayTypeStyle" />
 		<module name="FinalParameters" />
 		<module name="TodoComment" />
 		<module name="UpperEll" />
 
-		<!-- Adding to Sun convention: -->
+		<!-- Added to Sun convention: -->
 		<module name="SuppressWarningsHolder" />
 	</module>
 </module>
diff --git a/src/main/java/fr/inrae/agroclim/indicators/GenerateMarkdown.java b/src/main/java/fr/inrae/agroclim/indicators/GenerateMarkdown.java
index f2a6a8adae6e12e127e0ca4ee28d4dd2dafdd09e..ff8e2be575a595c98ae6fdf767ea3a5645ae8309 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/GenerateMarkdown.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/GenerateMarkdown.java
@@ -42,7 +42,7 @@ import lombok.extern.log4j.Log4j2;
 public class GenerateMarkdown {
 
     /**
-     * Mardown YAML front matter.
+     * Markdown YAML front matter.
      */
     private static final String FRONT_MATTER = """
                                        ---
@@ -236,7 +236,7 @@ public class GenerateMarkdown {
                         Collections.sort(parameters);
                         writer.write(String.join(", ", parameters));
                     }
-                    // affichage des références des notes de l'indicateurs
+                    // affichage des références des notes de l'indicateur
                     writer.write(";");
                     final List<String> notes = new LinkedList<>();
                     if (ind.getNotes() != null && !ind.getNotes().isEmpty()) {
@@ -312,7 +312,7 @@ public class GenerateMarkdown {
                             }
                         }
                     }
-                    // affichage des références des notes de l'indicateurs
+                    // affichage des références des notes de l'indicateur
                     final List<String> notes = new LinkedList<>();
                     if (ind.getNotes() != null && !ind.getNotes().isEmpty()) {
                         ind.getNotes().forEach(note -> {
diff --git a/src/main/java/fr/inrae/agroclim/indicators/exception/ErrorMessage.java b/src/main/java/fr/inrae/agroclim/indicators/exception/ErrorMessage.java
index 55e34754124cdfbc71267f54e6c692faf4979c00..9f620353a57a696099ec209f6ec5440917c65e15 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/exception/ErrorMessage.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/exception/ErrorMessage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/exception/IndicatorsErrorCategory.java b/src/main/java/fr/inrae/agroclim/indicators/exception/IndicatorsErrorCategory.java
index 46715486617c6584fb6d856c7429ea817f577c47..d126d2fe8c628d0fd8f69df976896a4511ff6959 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/exception/IndicatorsErrorCategory.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/exception/IndicatorsErrorCategory.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package fr.inrae.agroclim.indicators.exception;
 
 import fr.inrae.agroclim.indicators.model.data.ResourceManager;
diff --git a/src/main/java/fr/inrae/agroclim/indicators/exception/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/exception/package-info.java
index dab52807e295d87a5457425fcd8c3bc180eda09b..f3215cc427f02a60e939b519c1d262bc502e50f8 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/exception/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/exception/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/exception/type/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/exception/type/package-info.java
index 647131bfe0e1b2c0d9ff930902b76e0925997871..86cfb7ff739b8765985b08ceab47d9211a545b55 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/exception/type/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/exception/type/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/AnnualPhase.java b/src/main/java/fr/inrae/agroclim/indicators/model/AnnualPhase.java
index 0b29089d85cb588a536086ba80a25dca29c23656..29b918c0899b626fade2b38059d0148667011d5b 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/AnnualPhase.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/AnnualPhase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/Computable.java b/src/main/java/fr/inrae/agroclim/indicators/model/Computable.java
index 412ae31044ad36e04b4555105e87d0c83728504c..c0a7c927fe8ca699fd1bceb90122e33cb6cd0c45 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/Computable.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/Computable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/Evaluation.java b/src/main/java/fr/inrae/agroclim/indicators/model/Evaluation.java
index e228def7d35866fadcca0f32a7f7cb2d8d4eecf9..9a45fcecdafaa72de54b19bd6895d5d9ae04fc92 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/Evaluation.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/Evaluation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -441,7 +441,7 @@ public final class Evaluation extends CompositeIndicator {
      * Compute indicator results for each step of provided climatic data.
      *
      * @return Results of computation by year, for each step in climatic data:
-     * Climatic date ⮕ (year, {@link EvalutationResult}).
+     * Climatic date ⮕ (year, {@link EvaluationResult}).
      * @throws IndicatorsException
      *             from Indicator.compute()
      */
@@ -748,9 +748,9 @@ public final class Evaluation extends CompositeIndicator {
     /**
      * Load climatic, phenological and soil resources.
      *
-     * @param climatic intialize climatic resources, not depending on needed
+     * @param climatic initialize climatic resources, not depending on needed
      * variables
-     * @param soil intialize soil resources, not depending on needed variables
+     * @param soil initialize soil resources, not depending on needed variables
      */
     public void initializeResources(final boolean climatic, final boolean soil) {
         LOGGER.trace("start");
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/EvaluationSettings.java b/src/main/java/fr/inrae/agroclim/indicators/model/EvaluationSettings.java
index da66f92b41fc1dc1f2a37e4665e922812956add9..deaf3c56d24bcf9516f0b99efe2464d3cfed6ac3 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/EvaluationSettings.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/EvaluationSettings.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/EvaluationState.java b/src/main/java/fr/inrae/agroclim/indicators/model/EvaluationState.java
index 55104c776da457584947417aa6044bfc7a0a1ce7..119c0caf17beb0990cb7245a31c5ce77656db841 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/EvaluationState.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/EvaluationState.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/HasParameters.java b/src/main/java/fr/inrae/agroclim/indicators/model/HasParameters.java
index b436297b6522fb6dc2f57a140af252effa06fbfe..b3197ea782feec96b4e321a73f23eb864c001463 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/HasParameters.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/HasParameters.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/Knowledge.java b/src/main/java/fr/inrae/agroclim/indicators/model/Knowledge.java
index 8c1faa5cff22aaaf68e8decf34e7964a5f02411d..0c0eedfd53245f7723342c188ae5e85471913d7c 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/Knowledge.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/Knowledge.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -70,7 +70,7 @@ import lombok.ToString;
 import lombok.extern.log4j.Log4j2;
 
 /**
- * knowledge.xml.
+ * Object loaded from knowledge.xml.
  *
  * @author Olivier Maury
  */
@@ -90,7 +90,7 @@ public final class Knowledge implements Cloneable {
             Normal.class, NumberOfDays.class, NumberOfWaves.class,
             PotentialSowingDaysFrequency.class, Quotient.class,
             SimpleIndicator.class, Sum.class, Tamm.class,
-            /*- Normalisation */
+            /*- Normalization */
             AggregationFunction.class, Exponential.class, JEXLFunction.class,
             Linear.class, NormalizationFunction.class, Sigmoid.class,
             /*- Criteria */
@@ -156,7 +156,7 @@ public final class Knowledge implements Cloneable {
             knowledge.indicators.forEach(ind ->
             ind.setIndicatorCategory(IndicatorCategory.CLIMATIC_EFFECTS));
             knowledge.culturalPractices.forEach(ind ->
-            ind.setIndicatorCategory(IndicatorCategory.CULTURAL_PRATICES));
+            ind.setIndicatorCategory(IndicatorCategory.CULTURAL_PRACTICES));
             return knowledge;
         } catch (final IndicatorsException ex) {
             LOGGER.error(ex);
@@ -263,7 +263,7 @@ public final class Knowledge implements Cloneable {
     }
 
     /**
-     * @return indicators in cultural pratices category
+     * @return indicators in cultural practices category
      */
     public List<CompositeIndicator> getCulturalPractices() {
         return culturalPractices;
@@ -334,7 +334,7 @@ public final class Knowledge implements Cloneable {
         switch (category) {
         case PHENO_PHASES:
             return getEcophysiologicalProcesses();
-        case CULTURAL_PRATICES:
+        case CULTURAL_PRACTICES:
             if (ind.isPhase()) {
                 return getCulturalPractices();
             }
@@ -354,11 +354,18 @@ public final class Knowledge implements Cloneable {
         }
     }
 
+    /**
+     * Get the first parameter matching id.
+     *
+     * @param id parameter id
+     * @return parameter or null if not found
+     */
     public Parameter getParameterById(final String id) {
         return this.parameters.stream()
                 .filter(parameter -> parameter.getId().equals(id))
                 .findFirst().orElse(null);
     }
+
     /**
      * Update localized description and name of indicator from Knowledge.
      *
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/LocalizedString.java b/src/main/java/fr/inrae/agroclim/indicators/model/LocalizedString.java
index efea6adb85c56a55c9a4ba9f553060bc9f0429ab..36f2df665c3a35469073ee4abdef59d70d158c9d 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/LocalizedString.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/LocalizedString.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/Nameable.java b/src/main/java/fr/inrae/agroclim/indicators/model/Nameable.java
index fe1640ba99f0221dff282f4f0ba50d7a02aeb6f1..52d296a37114824ba9e9239fa71eabd66f9b9ec4 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/Nameable.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/Nameable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/Parameter.java b/src/main/java/fr/inrae/agroclim/indicators/model/Parameter.java
index 917763097807c15ded13b0a6374444ca30c234d2..e077879ec6c5b7cb10263003f51c851a0192f762 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/Parameter.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/Parameter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/Quantifiable.java b/src/main/java/fr/inrae/agroclim/indicators/model/Quantifiable.java
index 6eca288129a7ecdd3dbdf748467f4ea2a38ddb04..96d650940624e44faa07b207435d65e6175490fe 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/Quantifiable.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/Quantifiable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/CompositeCriteria.java b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/CompositeCriteria.java
index c191e3f27d2b913de5597ee4544f31bbc306c180..ddc2e73280b87e3dbc946954b73d55a84b08b796 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/CompositeCriteria.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/CompositeCriteria.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/Criteria.java b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/Criteria.java
index 493bca82e55bcddc64a972be4906d669cd849712..4d2337be6a6eb97c60afd75bf5823e2e78240039 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/Criteria.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/Criteria.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/LogicalOperator.java b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/LogicalOperator.java
index 9b1e730c0db4f1846d14dcee4b4cf5181ab318ce..f41147fad77b0f5a21a1cd81016842e1b77f2beb 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/LogicalOperator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/LogicalOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/SimpleCriteria.java b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/SimpleCriteria.java
index 47dc30f55cc6c20078fe2381d875465e619f7ee2..5c55432ea46d223ae05342df67128299dff6be1a 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/SimpleCriteria.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/SimpleCriteria.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/package-info.java
index 1cb632bbd3f935c365300e86d47ca1405fca128d..6e184f14492da5458ce28d5f2fbf282f5e668f44 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/CriteriaVisitable.java b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/CriteriaVisitable.java
index 77d871a744a9a7cc68d16779e9a12dd9f4cad242..50984b0a3e116923f8ade43c32c5a4239a4e3264 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/CriteriaVisitable.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/CriteriaVisitable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/CriteriaVisitor.java b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/CriteriaVisitor.java
index d230d6793e7b4558d4e89f0ed04b567ed762690d..d6e8a206cdda4821f669f484b9efff96b9ecf63b 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/CriteriaVisitor.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/CriteriaVisitor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/package-info.java
index 22fce2b170041541a28f5c55b4bf32cb69e4e648..881c5c870fb0dde0a38c6202ef7261da1175cfcb 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/criteria/visitor/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/Data.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/Data.java
index 3e04afee18efe04eb26b016268bf5cb564358ea2..b40171f728b82cce334baee945e0ed6fc267a015 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/Data.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/Data.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/DataLoadingListener.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/DataLoadingListener.java
index 4b4b03d63056615020a3b63a52e8664d38b4823d..403d3dd7de348a6c75a90c043bb680125bae7f6b 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/DataLoadingListener.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/DataLoadingListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/DataLoadingListenerHandler.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/DataLoadingListenerHandler.java
index da1ac3bb8266ef9459c6cc588b4a44e8bdbda62c..229e3e92cc4a8cf6a8017f5ac6b9c2152b908265 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/DataLoadingListenerHandler.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/DataLoadingListenerHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/FileLoader.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/FileLoader.java
index 2b00aa6cf34d67dae0d01ee2c929bb29ddca4948..c44e9f4019b6e4d4bcf1947fd9594f563d9ec75a 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/FileLoader.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/FileLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/HasDataLoadingListener.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/HasDataLoadingListener.java
index 067901a3855da078fb7f80970e36410b4448d2e7..9aae68a498ed5d2dd9125e5035cabae1ebf8d3df 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/HasDataLoadingListener.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/HasDataLoadingListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/HourlyData.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/HourlyData.java
index 97ecc1477185353e784f38ad440b72ab98885c2d..583b4ef69113cc949d654539aa99c3043d617ddf 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/HourlyData.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/HourlyData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/Resource.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/Resource.java
index 7a28680f9556640ee4b3e9f0a63f05fe431fea67..1f8127d90585fd717858c26e95cf8178c9468986 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/Resource.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/Resource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/ResourceManager.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/ResourceManager.java
index 31b74dd20881b8a513272e43d04828e22c9bff8c..cadbd0eeeb0c74c908cf6d6c07edfff95f54fbd7 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/ResourceManager.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/ResourceManager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -129,7 +129,7 @@ public final class ResourceManager implements Serializable, Cloneable {
     /**
      * @return consistency errors
      */
-    public Map<ResourceErrorType, ErrorMessage> getConsitencyErrors() {
+    public Map<ResourceErrorType, ErrorMessage> getConsistencyErrors() {
         final Map<ResourceErrorType, ErrorMessage> errors = new EnumMap<>(ResourceErrorType.class);
         // variables not set ?
         if (variables == null) {
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/ResourcesLoader.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/ResourcesLoader.java
index 5ddf05858ae59ef68c383b802e2e2ef41754681b..fa750d2f679ec79e71be02120d7cb5798e47b968 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/ResourcesLoader.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/ResourcesLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/UseVariables.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/UseVariables.java
index b82ff6743ef0c36b02acf6faf24dd5b84145e296..fb2d01c377033031dd9765f70bbea81e456f0c91 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/UseVariables.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/UseVariables.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/Variable.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/Variable.java
index d96c8ea56f1d5e6d6a1d09299252005e8090bbc5..2e16a48f0e4442d6546ee759360e4f20b31071e4 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/Variable.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/Variable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateFileLoader.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateFileLoader.java
index 326812247ce7c22bb983359f459f4fdd36e078f5..10612db8a52a69a45c2ecd4cefda0a148dc4ae59 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateFileLoader.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateFileLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -443,7 +443,7 @@ public final class ClimateFileLoader extends FileLoader implements ClimateLoader
                     }
                 });
                 if (timeScale == TimeScale.DAILY) {
-                    dailyData.setEtpCalcultator(getEtpCalculator());
+                    dailyData.setEtpCalculator(getEtpCalculator());
                 }
                 dailyData.check(lineNumber, getFile().getName());
                 checkDate(previous, dailyData, lineNumber, getFile().getName());
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateLoader.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateLoader.java
index 4b19a716df8b53e56f59397e281224d490dce887..8b58a334610dcb9467f83450406fe3909b5a7241 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateLoader.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateLoaderProxy.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateLoaderProxy.java
index 55d0b61b268d3994c0f265a245e8768a10d5b83d..7b391265f900a45a57e242f991f91ad956b7a532 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateLoaderProxy.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateLoaderProxy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticDailyData.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticDailyData.java
index 4d19871cf2e87bbd3224ad9dc87cb9c71e71a3f5..2607235a75cf85834fe3e4e29321df067171ad13 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticDailyData.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticDailyData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -98,7 +98,7 @@ public final class ClimaticDailyData extends DailyData {
      */
     @Getter
     @Setter
-    private EtpCalculator etpCalcultator;
+    private EtpCalculator etpCalculator;
 
     /**
      * Related time scale.
@@ -126,7 +126,7 @@ public final class ClimaticDailyData extends DailyData {
     public ClimaticDailyData(final ClimaticDailyData data) {
         super(data);
         this.timescale = data.timescale;
-        this.etpCalcultator = data.etpCalcultator;
+        this.etpCalculator = data.etpCalculator;
     }
 
     @Override
@@ -141,7 +141,7 @@ public final class ClimaticDailyData extends DailyData {
         }
         if (timescale == TimeScale.DAILY && getRawValue(Variable.ETP) == null) {
             boolean missing = false;
-            for (final Variable variable : etpCalcultator.getVariables()) {
+            for (final Variable variable : etpCalculator.getVariables()) {
                 if (getRawValue(variable) == null) {
                     missing = true;
                 }
@@ -166,8 +166,8 @@ public final class ClimaticDailyData extends DailyData {
     @Override
     public ClimaticDailyData clone() throws CloneNotSupportedException {
         final ClimaticDailyData clone = (ClimaticDailyData) super.clone();
-        if (etpCalcultator != null) {
-            clone.etpCalcultator = etpCalcultator.clone();
+        if (etpCalculator != null) {
+            clone.etpCalculator = etpCalculator.clone();
         }
         clone.errors.addAll(errors);
         clone.warnings.addAll(warnings);
@@ -184,9 +184,9 @@ public final class ClimaticDailyData extends DailyData {
      */
     public Double getEtp() {
         Double etp = getRawValue(Variable.ETP);
-        if (etp == null && etpCalcultator != null) {
+        if (etp == null && etpCalculator != null) {
             try {
-                etp = etpCalcultator.compute(this);
+                etp = etpCalculator.compute(this);
                 setEtp(etp);
             } catch (IllegalArgumentException e) {
                 etp = null;
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticResource.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticResource.java
index b070439aa625e5c1d71b330fa90dcd748246c926..23d6089d287fdfdc2211ba27c55c7f559918c1ef 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticResource.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/EtpCalculator.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/EtpCalculator.java
index 2e193f14e35044ee4134d1786ab5439040af12c2..2205352c5765160f932aac342dad82dd96da4200 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/EtpCalculator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/EtpCalculator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/EtpPenmanMonteithFAO.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/EtpPenmanMonteithFAO.java
index 88846cf1684e6fc129296a43d061b17f04766f3b..d7202e754b4661cbe7a7dab3f02c7326a18b73b7 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/EtpPenmanMonteithFAO.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/EtpPenmanMonteithFAO.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/package-info.java
index 292437b5aeb81ba412f8dc006755cd5340279ea6..f19d56cfa6dc6249a050cb0b097803c89ede8361 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/climate/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/package-info.java
index 68c3aaaaf55d8f76378f72437c9a8b0314389cac..d7dc42ae549cf6034ffba2931341e331a64e2fe7 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageBuilder.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageBuilder.java
index 650d4fbcfe8a26acd21d276534cdba1928b8b5c0..66913b0f2c2035ae04997310b4f6ee9b8b97a58f 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageBuilder.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageData.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageData.java
index d704a6ee7afda506b074d99b9ee748f1792479f9..8357ce672b09909f470efeba5aaa14340401ff04 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageData.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhaseEnd.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhaseEnd.java
index 473c8b606dcf4d1a9f907911f9d3fc26e2115a00..e36e3bf85d7fa216c07e02d46b039f0b6ac5c185 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhaseEnd.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhaseEnd.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalModelType.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalModelType.java
index a5a5ec99f1ca6c64f687c2d0758ac8e894cbc6d0..a6a1eb42fb7f01e11ef8455b9411394200060a31 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalModelType.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalModelType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalResource.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalResource.java
index e0e9e9fd9a3a0df6b22a91120721af89c2263c44..28f728d94138fa835c521663489a78d9c3e3cff8 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalResource.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculator.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculator.java
index fa9d117aa0d408521a88f851735f3dec33bb16f3..a7e92e16f9a22d60ac141beb66c479905a7b3c59 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyFileLoader.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyFileLoader.java
index 04e9487a62bff033be75bf1a0ec68dff28969462..8557b9dfcf6b3f5f109d2e90ecac3e721019e1f5 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyFileLoader.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyFileLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyLoaderProxy.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyLoaderProxy.java
index c1b472589ed94fdf2fe4a81843544ce6f72231d4..73433a5810735ca59a0dcfda98dad9303e52a1f5 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyLoaderProxy.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyLoaderProxy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/RelativeAnnualStageCalculator.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/RelativeAnnualStageCalculator.java
index aa691c50934b6ce51e59f804d2680065aa59f3d8..28f7fd36d888ec98d888da976ace4424649e299d 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/RelativeAnnualStageCalculator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/RelativeAnnualStageCalculator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/Stage.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/Stage.java
index 81726469e151b5c0d63d3a47b6c716793b82cc72..cd96d75fb9273068184758f37281c8b32a739eb2 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/Stage.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/Stage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/StageDelta.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/StageDelta.java
index ab801623c1c1afa3e28c31a26af9c52e08a20aa0..dd01f58e9d1dfd53ebf0336693e772eec89ee5e4 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/StageDelta.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/StageDelta.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/package-info.java
index 3d89a942733ad24448004860912cb39456cd80b7..19f0b4ebea76e6dd56055731615d0f0dc7f719b9 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/phenology/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/HasSoilCalculatorParams.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/HasSoilCalculatorParams.java
index 593a628c42a323f33ead603e031c183b8ccdb0fd..79b35af8656c07cdf94834dd941a2d46a26478d5 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/HasSoilCalculatorParams.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/HasSoilCalculatorParams.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilCalculator.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilCalculator.java
index 85ef7485f4283172e36d10b7198f0b9b55564e11..75c2cf9e79ad611d5f9fcbbf1b2219e00dddbcfc 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilCalculator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilCalculator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilDailyData.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilDailyData.java
index 41592f197629063d6a6de1a1b0c360220677c257..44b38c60490b72778d9f616c15d14b0a1474c9e5 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilDailyData.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilDailyData.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilFileLoader.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilFileLoader.java
index 498b27a19bca38b36cb22ddbdd1e14417ee9e0a1..3f6292840cb7540471e7a90862b3020ec611c4b5 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilFileLoader.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilFileLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoader.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoader.java
index 2a8476d0cde70e042170bb01ed2e8da5c452cf5f..1bd6e0bd06a6f65ee5eb4e763485b9de38c42b6d 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoader.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoaderProxy.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoaderProxy.java
index af86fe1ecbb181e4927f4a9883f6cbd75a680ec0..1a002780e28c125ceb938f3510dd60fcc371e6ab 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoaderProxy.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoaderProxy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilResource.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilResource.java
index 7eec49a1e6acf134c89d347190c5ad1434e81e2e..db9ca79051aa0c070c392bed4ef406e1c83ade60 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilResource.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/SoilResource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/package-info.java
index 0854b7daf0930a0bf50c13e0aa0242ed3a79f8c0..8fbc782a753ceb21639e9ef607d66ab10d247d7c 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/data/soil/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/AggregationFunction.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/AggregationFunction.java
index c5f0db258ebe10f51c21a61dff262299a2331d04..e5c6701ea554a7eadb1dfe5920345a4a6c8d49cf 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/AggregationFunction.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/AggregationFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/MathMethod.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/MathMethod.java
index e074b7a5310b6c9eded953b19a5ffb1668ba5576..a8c8640ada1bfc6bf822f9810283e93691a52387 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/MathMethod.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/MathMethod.java
@@ -9,10 +9,7 @@ import fr.inrae.agroclim.indicators.model.JEXLFormula;
 /**
  * Aggregation methods for {@link JEXLFormula}.
  *
- * Last changed : $Date: 2021-05-27 14:07:41 +0200 (jeu. 27 mai 2021) $
- *
- * @author $Author: omaury $
- * @version $Revision: 535 $
+ * @author Olivier Maury
  */
 public class MathMethod {
     /**
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/package-info.java
index 2936b1caa72e492b4a7bd3fb3257f463d4158c9b..53242fef2e1ef3953e110bc67747a816e26ee62e 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/aggregation/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/listener/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/listener/package-info.java
index 108d14d6a0d19f4fab0e2a2d17ef396b1383cf23..aba952015a73ba5bdee5cab3643ba341b6dfa83f 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/listener/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/listener/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Exponential.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Exponential.java
index c6df7f5a3d66185c94a0dce9c9f0a3cddf5c6dea..4a666bfaac8cd180f6828a15a23be217381541b6 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Exponential.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Exponential.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Linear.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Linear.java
index 53659271b08bb0e0bb83ea085f8eac1e733a4d67..d7c10e54981ec613162f38243ff40fc25ba59525 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Linear.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Linear.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Normal.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Normal.java
index 7a6d776ba9d6d5f69063cb5dbdc188e698e2087f..a9be3bd077b60df712a6bb2d23692f533d8e5073 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Normal.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Normal.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/NormalizationFunction.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/NormalizationFunction.java
index ce46811017096b5685a3168b3c14792714001e09..abf9d9af8c7dbc96007f98a643847fd6698be3c6 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/NormalizationFunction.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/NormalizationFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Sigmoid.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Sigmoid.java
index 5a671130fbd0b582706b6e24e9907ac72279d512..5939c209e9a4a76dbe35e8e4e3c27c7f398dcc61 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Sigmoid.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/Sigmoid.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/package-info.java
index 226f9cf9a0748270a6cc01a53c18793a1d857ce4..0026774011fdd8ded66120b9402cdf57c0d667ac 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/function/normalization/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Average.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Average.java
index 9808f2d62a503d712fd22933990e4802430e2bb8..757dd93e798d685aeaa6709435a50cf450a7d61c 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Average.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Average.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/AverageOfDiff.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/AverageOfDiff.java
index 9133601470f9f86f31bcfe435d32f1a610494db0..af1cf287cce9002f39ab10e7096edbb8bd78a984 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/AverageOfDiff.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/AverageOfDiff.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/CompositeIndicator.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/CompositeIndicator.java
index b639fc7017df7c3cdbbdd415c9a71268afb205bf..e8d0637305431120259b04f2505f6eb7df648be1 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/CompositeIndicator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/CompositeIndicator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -221,7 +221,7 @@ implements DataLoadingListener, Detailable, HasDataLoadingListener, Comparable<I
     }
 
     /**
-     * Remove all agregation function listeners.
+     * Remove all aggregation function listeners.
      */
     public final void clearFunctionListener() {
         for (final AggregationFunctionListener listener
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/DayOfYear.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/DayOfYear.java
index 371a0a6a390b2feec25329c3fb4c5bd7a9d910c3..1eeee0266115340431325c5e304739cc48d2c61c 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/DayOfYear.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/DayOfYear.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Detailable.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Detailable.java
index 09e991f50c24f26f481f4782cf06d0a0db1e9272..89452df99e30b78a8ad91680cc6de892c0252a05 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Detailable.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Detailable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/DiffOfSum.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/DiffOfSum.java
index 94af89664718a160afc285d2ebc3224101fc3500..1a2203ed1a5e3abecb0d7918536b4ca5e4f4be2b 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/DiffOfSum.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/DiffOfSum.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Frequency.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Frequency.java
index 3232741fda904b6c682429829c4714c70c01f33d..e4d0ecca4284a61aa1efbf3fbe587cb9754fe83a 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Frequency.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Frequency.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Indicator.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Indicator.java
index e383f79e9c58b43b21c9c899b37b8cd7e29e835a..7dd7a4ef2fd2cfdf254099adc9481d5453d87402 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Indicator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Indicator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/IndicatorCategory.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/IndicatorCategory.java
index 213e34c853aa91e744a5d2aef917e19c3110d8c6..a8e9994b3f4f063912c90e93c15789bb94f9e117 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/IndicatorCategory.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/IndicatorCategory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@ public enum IndicatorCategory {
     /** . */
     PHENO_PHASES(1, "pheno"),
     /** . */
-    CULTURAL_PRATICES(2, "practices"),
+    CULTURAL_PRACTICES(2, "practices"),
     /** . */
     ECOPHYSIOLOGICAL_PROCESSES(3, "ecoprocesses"),
     /** . */
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Max.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Max.java
index 8cd58d459206f1831cfebf448128654c112911b8..38a217e1acaa22b6ddb5baa8f0b35d4e455c573e 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Max.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Max.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/MaxWaveLength.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/MaxWaveLength.java
index fa25e39b793c3c2e2c4571b30aeccee45b58e095..88768d3cca98ae0e66592c88a5b5597a5b6bd944 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/MaxWaveLength.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/MaxWaveLength.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Min.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Min.java
index 6f1b24c82d14d37369daa4537be7eaefbf3bd857..a7f912ecd7adf1963b7b472ae6e77f37f0120239 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Min.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Min.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfDays.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfDays.java
index e9055245db70938f794b8522e2d449f07b5602c7..dd6ec2ba78f6b76f31acaeac37d00eb04c3b237e 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfDays.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfDays.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfWaves.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfWaves.java
index c9cfa8cec7b9bdeb564ef0d1abb13fe51f4228bd..d72407ace432bbde174383356af43d67dd654738 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfWaves.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfWaves.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/PhaseLength.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/PhaseLength.java
index 12ace4a41ff58490ad17a8766d3355f6e1f9543e..6ba918cebfd826968dfee1cfbf840b28c03cc6ae 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/PhaseLength.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/PhaseLength.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/PotentialSowingDaysFrequency.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/PotentialSowingDaysFrequency.java
index 20639bee2c8dc9276fc5069eb21b48c85093af54..97f5b1089c5c63db2aaccb8d4b2df74311c2abf6 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/PotentialSowingDaysFrequency.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/PotentialSowingDaysFrequency.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Quotient.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Quotient.java
index c3421b7e283218e1d6a064b9aa6e1eeb7c29bf46..69567b47515ef9022e9426263466d497d5ba31f5 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Quotient.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Quotient.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicator.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicator.java
index 439b578887019ca0cae28319468abb517b408fe9..4bf2b7042b71583fcc52668dba45752e5552525a 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicator.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicatorWithCriteria.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicatorWithCriteria.java
index 854f420e590ffc6ed14ff59ed611dd638b8d07e3..7087d3e39545c8d724a74cbecae7f3ae81facb6d 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicatorWithCriteria.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicatorWithCriteria.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicatorWithoutParameters.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicatorWithoutParameters.java
index e7aa2991d6c0698dc17c3e30858b9b2226a22cbb..1b6e86c3ba8be85589c4fc70ea4942845949bc9c 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicatorWithoutParameters.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/SimpleIndicatorWithoutParameters.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Sum.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Sum.java
index daad1941e9e52b5786804f21c59f1df539d432ee..f244dd02e35b1a5c0a33b0af68b26bf403ee28e4 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Sum.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/Sum.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/HasIndicatorListener.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/HasIndicatorListener.java
index b38d5874451f285316b048c1142cafffa2dc876e..623464beebdae75d31f630cb1cecf2ce6a6683d3 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/HasIndicatorListener.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/HasIndicatorListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorEvent.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorEvent.java
index 204b561f9cddbde497b656cbdd470ba5f6e13fb7..eeb4ea2115798e114da3f841f244b3b1a40d315f 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorEvent.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorListener.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorListener.java
index 62ef7971194aa3c8102cc9a57b575c89d2b3d74d..73993fda6e9cfdcaa6b01a2a43f2b2fe7135453f 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorListener.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorListener.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/package-info.java
index 5cd4b41dd48ebed1f581e323ea4b4790bdae0348..9ad0c296537a1274f91dfc386b26cb16bdf75465 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/listener/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/package-info.java
index 1adf3d07a6a0eac3c149a01f7f71aafad467bbc9..ada208a2d6566471bea04c5b0c11eb735c3f9a75 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/indicator/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/indicator/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/package-info.java
index 4cc8cbe535790cc6cdcc9df2faed6a9bb4549f7f..9d210d7ec8e0b63f20925b9480dd94349631b5d7 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/result/EvaluationResult.java b/src/main/java/fr/inrae/agroclim/indicators/model/result/EvaluationResult.java
index d0fba97c8568481b5087dd470998c7a7d8449b02..43bd164ffaa456cba294cd57c81d18282db0ec79 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/result/EvaluationResult.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/result/EvaluationResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/result/IndicatorResult.java b/src/main/java/fr/inrae/agroclim/indicators/model/result/IndicatorResult.java
index 0d7bd5a3abd68c87543c84a718d1706bdb10f00a..51f4b2aef2eb77acd3d52873dbe47d77197b6bee 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/result/IndicatorResult.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/result/IndicatorResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/result/PhaseResult.java b/src/main/java/fr/inrae/agroclim/indicators/model/result/PhaseResult.java
index b83a84dab24b9459cfba496e49373b4b3b5358a1..36e943f057cc789bdbd6df574e643d56e2575314 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/result/PhaseResult.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/result/PhaseResult.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/result/Result.java b/src/main/java/fr/inrae/agroclim/indicators/model/result/Result.java
index 7d327e0745009f5b97f9a84ec1d8d6b48ec2334e..1eec1d9fe87d1f33751c78e8fcc88ba8a8ad1c46 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/result/Result.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/result/Result.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/model/result/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/model/result/package-info.java
index 662ff01cec2b41951d6eb4574a6b375feedb468d..2b77eead3ea7519543ccd22d368fc5469eebb87f 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/model/result/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/model/result/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/package-info.java
index 667a92b4cca53b17a1a5c0af775388848de56c85..452b2d067569542c7102bd485c838b3c267c577e 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/resources/I18n.java b/src/main/java/fr/inrae/agroclim/indicators/resources/I18n.java
index 24fc0b74abf8a7d230438f0c9d1f8361ada7eee7..7710005ac1a0d01410b6cb51226cb151606b2b49 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/resources/I18n.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/resources/I18n.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/resources/Messages.java b/src/main/java/fr/inrae/agroclim/indicators/resources/Messages.java
index e150b64c5fdeb46c33a8b29dd6071a5af3306a16..d6b5524951fabde1e317da235941cd8d6c1b3d38 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/resources/Messages.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/resources/Messages.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/resources/Resources.java b/src/main/java/fr/inrae/agroclim/indicators/resources/Resources.java
index 2187d17bc01375cd751f76571a0174e31eaa0ae9..6491dea342beb6926940a382c063a0c6a5165a54 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/resources/Resources.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/resources/Resources.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/resources/Version.java b/src/main/java/fr/inrae/agroclim/indicators/resources/Version.java
index 354acbfe38a26c2183fa7b89f52116798cf7c28d..f8c2441fb3a527c88ff586c1f5c48e5d547858f3 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/resources/Version.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/resources/Version.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -22,10 +22,7 @@ import java.util.Locale;
 /**
  * Information on version of Indicators.
  *
- * Last change $Date$
- *
- * @author $Author$
- * @version $Revision$
+ * @author Olivier Maury
  */
 public final class Version {
 
diff --git a/src/main/java/fr/inrae/agroclim/indicators/resources/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/resources/package-info.java
index 70193eed34963ae1b72449a2328bf57f58fb9814..9aa627e96672b2a9fa83801b2881d1c6a18b5471 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/resources/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/resources/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/util/DateUtils.java b/src/main/java/fr/inrae/agroclim/indicators/util/DateUtils.java
index a48318891ffd692e5d431e1253d55f4da6a8f533..ea94d5df42410acd20b3ed058c2f68182de20a4b 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/util/DateUtils.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/util/DateUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/util/DeepCopyHelper.java b/src/main/java/fr/inrae/agroclim/indicators/util/DeepCopyHelper.java
index 4ae2202dc922c469e701a48e3c4c27bf53fac4fa..7dbfcecde89a401b7c763bdb358263de093327d2 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/util/DeepCopyHelper.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/util/DeepCopyHelper.java
@@ -11,10 +11,7 @@ import java.util.Map.Entry;
 /**
  * Helper methods to make deep copies using copy constructors, in order to avoid {@link Cloneable}.
  *
- * Last changed : $Date$
- *
- * @author $Author$
- * @version $Revision$
+ * @author Olivier Maury
  */
 public interface DeepCopyHelper {
 
diff --git a/src/main/java/fr/inrae/agroclim/indicators/util/Doublet.java b/src/main/java/fr/inrae/agroclim/indicators/util/Doublet.java
index 47860fb31de960334ba2fca01e69229d894eab98..df01ecc4942b7f00e079265d28f88f011b2c6af1 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/util/Doublet.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/util/Doublet.java
@@ -5,13 +5,11 @@ package fr.inrae.agroclim.indicators.util;
  *
  * Last changed : $Date$
  *
- * @author Olivier Maury <Olivier.Maury@inrae.fr>
- * @author $Author$
+ * @author Olivier Maury
  * @param first  first item
  * @param second second item
  * @param <T> class of first item
  * @param <U> class of second item
- * @version $Revision$
  */
 public record Doublet<T, U>(T first, U second) {
 
@@ -22,7 +20,7 @@ public record Doublet<T, U>(T first, U second) {
      * @param second second item
      * @param <T>    class of first item
      * @param <U>    class of second item
-     * @return instanciated doublet.
+     * @return instantiated doublet.
      */
     public static <T, U> Doublet<T, U> of(final T first, final U second) {
         return new Doublet<>(first, second);
diff --git a/src/main/java/fr/inrae/agroclim/indicators/util/ErrorTypeUtils.java b/src/main/java/fr/inrae/agroclim/indicators/util/ErrorTypeUtils.java
index a056ef3e35178e4139b65ff199f2d7c62ac68fd1..cc4d47744a02d4d580998880ebbe2ab14284841c 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/util/ErrorTypeUtils.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/util/ErrorTypeUtils.java
@@ -18,6 +18,12 @@ import fr.inrae.agroclim.indicators.resources.I18n;
  */
 public interface ErrorTypeUtils {
 
+    /**
+     * Get duplicated codes for the Enum.
+     *
+     * @param clazz enum class
+     * @return duplicated codes
+     */
     static Set<String> getDuplicatedCodes(final Class<? extends Enum<?>> clazz) {
         final Set<String> duplicates = new HashSet<>();
         final Set<String> codes = new HashSet<>();
diff --git a/src/main/java/fr/inrae/agroclim/indicators/util/StageUtils.java b/src/main/java/fr/inrae/agroclim/indicators/util/StageUtils.java
index 8b04484063de1b0b11c3dfa5c3757340e95d2167..b53e21aebd94ccfd4de03acdbea9152f97243eb7 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/util/StageUtils.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/util/StageUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/util/StringUtils.java b/src/main/java/fr/inrae/agroclim/indicators/util/StringUtils.java
index d747942588f92792fc50111f62132bfd278d83db..71b96e914bf5c4b0252a379ad7a51aaa606216a0 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/util/StringUtils.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/util/StringUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/util/Utf8BufferedWriter.java b/src/main/java/fr/inrae/agroclim/indicators/util/Utf8BufferedWriter.java
index c30a8eefc08f67df66eac818061b86aa137d096e..669a1bc78b2124fa199c7b4e2023126b1cfbad80 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/util/Utf8BufferedWriter.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/util/Utf8BufferedWriter.java
@@ -11,10 +11,7 @@ import java.nio.file.Path;
 /**
  * Shortcut class to write UTF-8 files.
  *
- * Last change $Date$
- *
- * @author $Author$
- * @version $Revision$
+ * @author Olivier Maury
  */
 public class Utf8BufferedWriter extends BufferedWriter {
 
diff --git a/src/main/java/fr/inrae/agroclim/indicators/util/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/util/package-info.java
index 7397574271fe2b790205f088678cce2b7474dfa4..6ec548f82a2ac1824cc966e10fa69229ecbde3d0 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/util/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/util/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/xml/XMLUtil.java b/src/main/java/fr/inrae/agroclim/indicators/xml/XMLUtil.java
index 0a1c8773e009e026da09c54b1475d7f72c74af41..57c34ccdda2b1ff968ff43c55b70fb36fe303b77 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/xml/XMLUtil.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/xml/XMLUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/main/java/fr/inrae/agroclim/indicators/xml/package-info.java b/src/main/java/fr/inrae/agroclim/indicators/xml/package-info.java
index 81b72c5baa93320f497110f2aebb90356b69bcb0..c15f6663aecdfb8744e019c7f546fa29fbdfeb18 100644
--- a/src/main/java/fr/inrae/agroclim/indicators/xml/package-info.java
+++ b/src/main/java/fr/inrae/agroclim/indicators/xml/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/exception/ErrorMessageTest.java b/src/test/java/fr/inrae/agroclim/indicators/exception/ErrorMessageTest.java
index a632495152331ea294b21f5387fb4e6d7bdd2829..e5b4935a5832ccd66e6bc179a3fa5f73ba7fa015 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/exception/ErrorMessageTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/exception/ErrorMessageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/EvaluationSettingsTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/EvaluationSettingsTest.java
index 4976e11732f1db89930cd9cc664fd1b07f2cd5ef..969334e82681bd9e54926d29bdf20d3d90f1fdee 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/EvaluationSettingsTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/EvaluationSettingsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/EvaluationTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/EvaluationTest.java
index 0603a053344e58168965dcd3287b09f62e9bd5f3..d9dcc2a19c3fc5efdfae836f82aab99c22f510c9 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/EvaluationTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/EvaluationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/KnowledgeDailyTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/KnowledgeDailyTest.java
index 8c564e1a6cae44e15d8805509bcd953860c88c13..952a4ed058037fb90d191ea579fb002d2acc72de 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/KnowledgeDailyTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/KnowledgeDailyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/KnowledgeTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/KnowledgeTest.java
index 72d0684e7f88c6b87b34da73403cb6fa80f500d7..de38a35983fd3cbd94bfbab1f1047be58ae7a22b 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/KnowledgeTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/KnowledgeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -276,7 +276,7 @@ public final class KnowledgeTest {
         String indicatorId = "s0s2";
         CompositeIndicator indicator = new CompositeIndicator();
         indicator.setId(indicatorId);
-        indicator.setIndicatorCategory(IndicatorCategory.CULTURAL_PRATICES);
+        indicator.setIndicatorCategory(IndicatorCategory.CULTURAL_PRACTICES);
         indicator.setTag("pheno-s0-s2");
         List<? extends Indicator> next = knowledge.getNextIndicators(indicator);
         assertFalse(indicatorId + " do have child indicators.", next.isEmpty());
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/LocalizedStringTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/LocalizedStringTest.java
index 843d0246990034699ac7d6a6e7f11c6803d40f64..ab97d529579a216e7f4281061a5ad661209edaa8 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/LocalizedStringTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/LocalizedStringTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/MMarjouTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/MMarjouTest.java
index a102b23ac2427707322be6657ca861ae5270836c..de8c593c2d189d54fca097bd257b61faa0fb0262 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/MMarjouTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/MMarjouTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/RaidayMeantTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/RaidayMeantTest.java
index c31942d796a984e3d3eaf7bc831108afcb43255d..a673fd4a3cb101bd036b694cb8575c3bd3e31ad9 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/RaidayMeantTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/RaidayMeantTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -145,7 +145,7 @@ public class RaidayMeantTest extends DataTestHelper {
 
     /**
      * @param date date to format
-     * @return formated date
+     * @return formatted date
      */
     private static String dateRepr(@NonNull final Date date) {
         return SDF.format(date);
@@ -156,7 +156,7 @@ public class RaidayMeantTest extends DataTestHelper {
      *
      * @param year year
      * @param doy day of year
-     * @return formated date
+     * @return formatted date
      */
     private static String dateRepr(final int year, final int doy) {
         final Date date = DateUtils.getDate(year, doy);
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/StageDeltaEvaluationTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/StageDeltaEvaluationTest.java
index 8e5b6573625b01320dc391873a8048acf605868e..0a1c3adad53cf0afbc9e117bb5f136aa8c1eb1c1 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/StageDeltaEvaluationTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/StageDeltaEvaluationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/criteria/CompositeCriteriaTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/criteria/CompositeCriteriaTest.java
index 08e536e50606d62157e38e17aa53ea52a07f686c..a27956b023ec92350b5c6115973359064d84dcd4 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/criteria/CompositeCriteriaTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/criteria/CompositeCriteriaTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/DailyDataTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/DailyDataTest.java
index 92ebbea1b3a964e446d0b5a1fe181b1498035fe3..3dd2c75724bfe451fa78b7164b6c5c6784e0d4a0 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/DailyDataTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/DailyDataTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/DataTestHelper.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/DataTestHelper.java
index 16bf8345a1eba64f44d917e0357abc0360711f6c..a9f1ac5c6bb3e03e535a318d4503a1d62c48a5c4 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/DataTestHelper.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/DataTestHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -432,7 +432,7 @@ public abstract class DataTestHelper {
      *
      * @param baseName base name of file (without .ini)
      * @return loaded properties
-     * @throws FileNotFoundException shoud not occur
+     * @throws FileNotFoundException should not occur
      * @throws IOException  should not occur
      */
     protected static Properties getPhenologyProperties(final String baseName)
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/ResourceManagerTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/ResourceManagerTest.java
index fea3003051dd44bba111545db20280fe1024104a..5c406135c4d3b0aeea083c497272499c2999759f 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/ResourceManagerTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/ResourceManagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -53,7 +53,7 @@ public final class ResourceManagerTest extends DataTestHelper {
         final ResourceManager mgr = new ResourceManager();
 
         // without variables
-        Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsitencyErrors();
+        Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsistencyErrors();
         assertNotNull("Empty ResourceManager must return consistency errors!",
                 errors);
         final Set<ResourceErrorType> expectedErrors = new HashSet<>();
@@ -69,7 +69,7 @@ public final class ResourceManagerTest extends DataTestHelper {
         mgr.setVariables(variables);
         expectedErrors.addAll(Arrays.asList(ResourceErrorType.CLIMATE,
                 ResourceErrorType.PHENO));
-        errors = mgr.getConsitencyErrors();
+        errors = mgr.getConsistencyErrors();
         assertNotNull("Empty ResourceManager must return consistency errors!",
                 errors);
         assertEquals("Empty ResourceManager must have errors on all resources",
@@ -89,7 +89,7 @@ public final class ResourceManagerTest extends DataTestHelper {
                 "radiation", "rain", "tmean", "tmin", "tmax", "rh", "wind"};
         mgr.getClimaticResource().setData(getClimaticData(
                 "climate-missing-data.csv", ";", headers));
-        final Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsitencyErrors();
+        final Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsistencyErrors();
         final String subject = "ResourceManager with missing days in climatic "
                 + "resource ";
         assertNotNull(subject + "must return consistency errors!", errors);
@@ -111,7 +111,7 @@ public final class ResourceManagerTest extends DataTestHelper {
         mgr.setVariables(variables);
         mgr.getClimaticResource().setData(getClimatic2015Data());
         mgr.getPhenologicalResource().setData(getPheno2015Data());
-        final Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsitencyErrors();
+        final Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsistencyErrors();
         assertNull(errors);
     }
 
@@ -125,7 +125,7 @@ public final class ResourceManagerTest extends DataTestHelper {
         variables.add(Variable.TMEAN);
         mgr.setVariables(variables);
         mgr.getClimaticResource().setData(getClimatic2015Data());
-        final Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsitencyErrors();
+        final Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsistencyErrors();
         final String subject = "ResourceManager with only climatic resource ";
         assertNotNull(subject + "must return consistency errors!", errors);
         final Set<ResourceErrorType> expectedErrors = new HashSet<>();
@@ -148,7 +148,7 @@ public final class ResourceManagerTest extends DataTestHelper {
         final List<AnnualStageData> data = getPhenoSampleData();
         data.remove(data.size() - 1);
         mgr.getPhenologicalResource().setData(data);
-        final Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsitencyErrors();
+        final Map<ResourceErrorType, ErrorMessage> errors = mgr.getConsistencyErrors();
         assertNotNull(errors);
         final Set<ResourceErrorType> expectedErrors = new HashSet<>();
         expectedErrors.add(ResourceErrorType.CLIMATE_YEARS);
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateFileLoaderTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateFileLoaderTest.java
index 0663149a5cf651f0ed9391496076702267a2c2ba..0e4d8c61c4547b7e1dc448811b47f663050f5f86 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateFileLoaderTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateFileLoaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateTest.java
index c892c18a7fe0d8ecd45e94d1fa31a4dd061af577..05d3ac1df319c1fdfc24181a52fc157876139d7f 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -40,7 +40,7 @@ import fr.inrae.agroclim.indicators.model.data.DataTestHelper;
  */
 public final class ClimateTest extends DataTestHelper {
     /**
-     * Test loading test-evalutation.xml.
+     * Test loading test-evaluation.xml.
      */
     @Test
     public void load() {
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticResourceTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticResourceTest.java
index 6d3fd7cc9afddb26ca18d1af9d710d28e6c1bbb0..fc59729f0c07f19526b16b35e454a6b54b2b0ad6 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticResourceTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/ClimaticResourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -47,13 +47,12 @@ public final class ClimaticResourceTest extends DataTestHelper {
         int year = res.getYears().get(0);
         final int start = 120;
         final int end = 140;
-        ClimaticResource filtred = res.getClimaticDataByPhaseAndYear(start,
-                end, year);
-        assertFalse(filtred.isEmpty());
-        assertFalse(filtred.getYears().isEmpty());
-        int nbOfDays = filtred.getData().size();
+        final ClimaticResource filtered = res.getClimaticDataByPhaseAndYear(start, end, year);
+        assertFalse(filtered.isEmpty());
+        assertFalse(filtered.getYears().isEmpty());
+        final int nbOfDays = filtered.getData().size();
         assertEquals(end - start, nbOfDays);
-        assertEquals(start, filtred.getData().get(0).getDayOfYear());
-        assertEquals(end - 1, filtred.getData().get(nbOfDays - 1).getDayOfYear());
+        assertEquals(start, filtered.getData().get(0).getDayOfYear());
+        assertEquals(end - 1, filtered.getData().get(nbOfDays - 1).getDayOfYear());
     }
 }
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/EtpPenmanMonteithFAOTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/EtpPenmanMonteithFAOTest.java
index 86da6c7591430ec96aa6da2e1cae539e62f62a24..486883bc007170aab89d25752720f7ab01b2635b 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/EtpPenmanMonteithFAOTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/climate/EtpPenmanMonteithFAOTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -30,10 +30,7 @@ import fr.inrae.agroclim.indicators.model.data.DataTestHelper;
 /**
  * Test ETP calculator from ClimaticDailyData.
  *
- * Last changed : $Date$
- *
- * @author $Author$
- * @version $Revision$
+ * @author Olivier Maury
  */
 public final class EtpPenmanMonteithFAOTest extends DataTestHelper {
 
@@ -59,17 +56,17 @@ public final class EtpPenmanMonteithFAOTest extends DataTestHelper {
         List<ClimaticDailyData> climaticDailyData = getClimatic2015Data();
 
         for (ClimaticDailyData data : climaticDailyData) {
-        	
+
         	// #7012: ETP FAO method expects radiation in MJ/m2 (W/m2  -> MJ/m2)
         	double radiation = data.getRadiation() * 0.0864;
         	data.setRadiation(radiation);
-        	
+
             Double expected = data.getEtp();
             data.setEtp(null);
             Double actual = calculatorWind2m.compute(data);
             assertEquals("Wrong for day " + data.getDay(), expected, actual,
                     0.000001);
-            data.setEtpCalcultator(calculatorWind2m);
+            data.setEtpCalculator(calculatorWind2m);
             Double actual2 = data.getEtp();
             assertEquals(
                     "Computed ETP from calculator or from data must be the same!",
@@ -84,11 +81,11 @@ public final class EtpPenmanMonteithFAOTest extends DataTestHelper {
     public void compareWithRResults() {
         ClimaticDailyData data = new ClimaticDailyData();
         data.setTmean(10.4);
-        
+
         // #7012: radiation retrieved from climatic db, and expected by ETP FAO = MJ/m2
         // 23.73 W/m2
         data.setRadiation(23.73 * 60 * 60 * 24 /1000 / 1000);
-        
+
         data.setRh(88.);
         data.setWind(1.);
         Double expected, actual;
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageBuilderTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageBuilderTest.java
index 5465aaf59c072c5578b816ef5f3eb903b1f08afa..c63bbad8802f7836f1662eb5b29d3af70542ba24 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageBuilderTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/AnnualStageBuilderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -86,7 +86,7 @@ public class AnnualStageBuilderTest {
 
     /**
      * @param stages AnnualStageData to represent
-     * @return represenation
+     * @return representation
      */
     private static List<String> repr(final List<AnnualStageData> stages) {
         final List<String> repr = new ArrayList<>();
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalModelTypeTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalModelTypeTest.java
index 9485b24729af5909404ad7da09b3766ca3187c61..f1213f0214a9ceb822f1917dc20f0713843f2446 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalModelTypeTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologicalModelTypeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculatorMethodsTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculatorMethodsTest.java
index f25b9ccd20e9a82fd170fc558f599a42ff87147f..ff72db83de34d8a5ac223c9eed6d841af62cb87e 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculatorMethodsTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculatorMethodsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculatorTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculatorTest.java
index 2b1468e0db8b12ba51ebb74d0581109e67da3f33..d3d5875dbc3653bcf6f1ef5396aca5e05a21ddba 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculatorTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyCalculatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyLoaderTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyLoaderTest.java
index fc54383268b80a35480618508afcfcd45fac3f7a..327b2c1343dcb90d7fc074d11be8c9b7d443b5bc 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyLoaderTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/PhenologyLoaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -39,7 +39,7 @@ import fr.inrae.agroclim.indicators.xml.XMLUtil;
  */
 public final class PhenologyLoaderTest extends DataTestHelper {
     /**
-     * Test loading test-evalutation.xml.
+     * Test loading test-evaluation.xml.
      */
     @Test
     public void load() {
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/RelativeAnnualStageCalculatorTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/RelativeAnnualStageCalculatorTest.java
index 2bfa14b40a12dd7ea0cdcdc631ed3c4c6eb0d2e6..5e6651a02581d5c1f68016aa0ddab17f224b0232 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/RelativeAnnualStageCalculatorTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/phenology/RelativeAnnualStageCalculatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilCalculatorTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilCalculatorTest.java
index 59293cad8448e088bf1595a9020d06019738b3c2..6067ba54d797bb87eb6179e8182aa8d89368c7ac 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilCalculatorTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilCalculatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -51,10 +51,7 @@ import fr.inrae.agroclim.indicators.util.DateUtils;
 /**
  * Test Soil data calculator from ClimaticDailyData.
  *
- * Last changed : $Date: 2023-05-30 15:49:13 +0200 (mar. 30 mai 2023) $
- *
- * @author $Author: omaury $
- * @version $Revision: 656 $
+ * @author Olivier Maury
  */
 public final class SoilCalculatorTest extends DataTestHelper {
 
@@ -357,11 +354,11 @@ public final class SoilCalculatorTest extends DataTestHelper {
         // 1. load Evaluation
         final File xmlFile = getFile("model/data/phenology/" + baseName + ".gri");
         final Evaluation evaluation = getEvaluation(xmlFile, false);
-        // 2. ajust ResourceManager
+        // 2. adjust ResourceManager
         final ResourceManager mgr = evaluation.getResourceManager();
         mgr.setCropDevelopmentYears(getInt(ini, "nbOfYears"));
         // check
-        assertTrue("There must be SOIL variables in RessourceManager.", mgr.hasSoilVariables());
+        assertTrue("There must be SOIL variables in ResourceManager.", mgr.hasSoilVariables());
         // 3. set SoilCalculator as it is not defined in XML
         final EvaluationSettings settings = evaluation.getSettings();
         settings.setSoilLoader(new SoilLoaderProxy());
@@ -371,7 +368,7 @@ public final class SoilCalculatorTest extends DataTestHelper {
         // 4. initialize resources
         evaluation.initializeResources();
         final Map<ResourceErrorType, ErrorMessage> errors;
-        errors = evaluation.getResourceManager().getConsitencyErrors();
+        errors = evaluation.getResourceManager().getConsistencyErrors();
         assertNull("No error must be found", errors);
         // Tests
         final List<ClimaticDailyData> data = evaluation.getResourceManager().getClimaticResource().getData();
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilFileLoaderTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilFileLoaderTest.java
index 1c729e3743725ceba2a50c1831947a8951946958..de653b33acb443ed73b570a38c034f52fdaffdbb 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilFileLoaderTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilFileLoaderTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoaderProxyTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoaderProxyTest.java
index 71775a27e8e0576953e0e87bb6f5ffd91f2b23b9..396eac3eb540177573c279caeca24ed0c98c84a3 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoaderProxyTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/data/soil/SoilLoaderProxyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/function/NormalizationFunctionTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/function/NormalizationFunctionTest.java
index 3182aeadc8a9c9e7a4d3ea55d166542239f6aa77..a02016fb609f78f4b27ba177a6192cd453167ad2 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/function/NormalizationFunctionTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/function/NormalizationFunctionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/function/aggregation/JEXLFunctionTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/function/aggregation/JEXLFunctionTest.java
index 5b226497c309506bc1e4375f851e923da31d8632..536acee13a5b9c43693b4010a3ff171819b2811c 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/function/aggregation/JEXLFunctionTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/function/aggregation/JEXLFunctionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/DayOfYearTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/DayOfYearTest.java
index a9ef8c8c6f89139356a4f39becc2517b6338e8d2..a546361e93e07f3d816f9f22d8e976c1a236fa6c 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/DayOfYearTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/DayOfYearTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/ImplementationsTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/ImplementationsTest.java
index 04454508b9e889816c55b371e24434c1f1f6b538..091ff6740f022ffbebe76ffac175ba9136d9fcd3 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/ImplementationsTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/ImplementationsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -83,7 +83,7 @@ public class ImplementationsTest {
      * Test that indicator defined in knowledge.xml implements  {@link Cloneable}.
      */
     @Test
-    public void isClonable() {
+    public void isCloneable() {
         String msg = String.format(
                 "Indicator '%s' of class '%s' must be cloneable.",
                 indicator.getName(),
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/IndicatorTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/IndicatorTest.java
index d1feff8bbd7d8eb5283f0bed7498ef20c5ba3167..a7c2589d3b5430e6dfc0bdddced4ee8d0d71f250 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/IndicatorTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/IndicatorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfDaysTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfDaysTest.java
index 4ad1a5d16cf7bdbde2b3043c5a65cb813d7e056b..ab6bae65f5e66ed69330b210362fb7f0c59bccf9 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfDaysTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/NumberOfDaysTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/QuotientTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/QuotientTest.java
index e2b255cd828765e5715eb035768a0f31e5e883fb..6ec69045abeb0739912b4da99685a006e11cee99 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/QuotientTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/QuotientTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorEventTest.java b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorEventTest.java
index 47fd97efe59fb9f325bafaec1fa7e8049efc8434..8383be5ed4f9c8f6dbaa6a35997db726de572195 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorEventTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/model/indicator/listener/IndicatorEventTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/resources/I18nPluralSuffixTest.java b/src/test/java/fr/inrae/agroclim/indicators/resources/I18nPluralSuffixTest.java
index 9d5d2fff1d2ce9b9e0caab6e6a6ac9ef63cbe8a6..f8be75bfb98ee7c31f8aa0d9a4d123da955645e2 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/resources/I18nPluralSuffixTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/resources/I18nPluralSuffixTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/resources/I18nTest.java b/src/test/java/fr/inrae/agroclim/indicators/resources/I18nTest.java
index 0cb3a8ccde940cc2138de65c6960a98e6b344a5b..c5008cfaccf1f932d3d94fb33d24d5eb290b7058 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/resources/I18nTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/resources/I18nTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
@@ -177,7 +177,7 @@ public class I18nTest {
     }
 
     @Test
-    public void contructorWithResourceBundle() {
+    public void constructorWithResourceBundle() {
         final ResourceBundle bundle = ResourceBundle.getBundle(NAME, Locale.FRENCH);
         final I18n res = new I18n(bundle);
         String actual;
diff --git a/src/test/java/fr/inrae/agroclim/indicators/resources/MessagesTest.java b/src/test/java/fr/inrae/agroclim/indicators/resources/MessagesTest.java
index e5382384f96078f45e445d464216347e7b361ed7..cb8d6ff28240eac667c05d74d98a820d00e91731 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/resources/MessagesTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/resources/MessagesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/resources/ResourcesTest.java b/src/test/java/fr/inrae/agroclim/indicators/resources/ResourcesTest.java
index 19eb8baf3a93c4802098051032fe2a4389d7d39a..b77e649435e757c98c7876909380bf290b0e112b 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/resources/ResourcesTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/resources/ResourcesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/resources/VersionTest.java b/src/test/java/fr/inrae/agroclim/indicators/resources/VersionTest.java
index 78db52b04efc6d8706b58db547ae37846ddaa780..240d380326bf172868912c92b8ac1d65be28d3c8 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/resources/VersionTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/resources/VersionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/util/DateUtilsTest.java b/src/test/java/fr/inrae/agroclim/indicators/util/DateUtilsTest.java
index 427c0eec9fb49cd90a682513fc9b5d7f64bb3f9a..862ad8d6af83245149a1af66e7c5b752dfc61f15 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/util/DateUtilsTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/util/DateUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/util/StageUtilsTest.java b/src/test/java/fr/inrae/agroclim/indicators/util/StageUtilsTest.java
index 39dc2f0cacf98205c7f3ee68d41dda8f9ad61858..b83e42fdb338b1b4cf62b2bb2ba38b733cb5606f 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/util/StageUtilsTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/util/StageUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/util/StringUtilsTest.java b/src/test/java/fr/inrae/agroclim/indicators/util/StringUtilsTest.java
index ede199296cd6ddb495dd393f1b5b2aae17ad7da0..8f69b59dbee0a581e489025571e4c96572d38480 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/util/StringUtilsTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/util/StringUtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify
diff --git a/src/test/java/fr/inrae/agroclim/indicators/xml/XMLUtilTest.java b/src/test/java/fr/inrae/agroclim/indicators/xml/XMLUtilTest.java
index d487005f453038be728f1859771458091511a9ab..c40b1ce933c84434cf27ac64b21a859b4669296a 100644
--- a/src/test/java/fr/inrae/agroclim/indicators/xml/XMLUtilTest.java
+++ b/src/test/java/fr/inrae/agroclim/indicators/xml/XMLUtilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of Indicators.
  *
  * Indicators is free software: you can redistribute it and/or modify