Author: chatellier Date: 2011-01-28 08:54:52 +0000 (Fri, 28 Jan 2011) New Revision: 609 Log: Fix javadoc Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2011-01-28 08:45:35 UTC (rev 608) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2011-01-28 08:54:52 UTC (rev 609) @@ -190,9 +190,9 @@ * * Somme les "Nombre" et "Poids" * - * @param mergeTuple - * @param tuple - * @return + * @param tuple1 first tuple to merge + * @param tuple2 second tuple to merge + * @return merged tuples */ protected String[] mergeLengths(String[] tuple1, String[] tuple2) { @@ -228,8 +228,8 @@ /** * Return true if a value * - * @param data - * @return + * @param data data value to check + * @return {@code true} if value is empty or NA */ protected boolean isNotAvailableData(String data) { boolean result = false; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-28 08:45:35 UTC (rev 608) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-28 08:54:52 UTC (rev 609) @@ -717,9 +717,9 @@ * est refusé, il ne descend pas dans les sous répertoire alors que dans * notre cas il le faut. * - * @param directory directory - * @param projectsDirectory - * @param indicatorsFileFilter + * @param srcDir source directory to copy + * @param destDir destination directory + * @param indicatorsFileFilter file filter for file to copy * @throws IOException */ protected void customCopyDirectory(File srcDir, @@ -1300,7 +1300,7 @@ * * @param project project * @param resultDirectory rsufi result directory - * @param rSUfiResult rsufi result + * @param rsufiResult rsufi result * @return map with each species code/species name * @throws CoserBusinessException */ @@ -1452,7 +1452,6 @@ * * @param resultDirectory rsufi result directory * @param rsufiResult result - * @param species to get indicator * @param locale locale ({@code fr} ou {@code en}) * @return indicator for species * @throws CoserBusinessException @@ -1613,7 +1612,7 @@ * @param selectionDirectory selection directory * @param resultDirectory rsufi result directory * @param rSufiResult rsufi result - * @param string species species (can be null for community) + * @param species species (can be null for community) * @param indicator indicator * @param locale locale (fr/en) * @return generated file (auto delete when jvm shutdown)