Author: tchemit Date: 2014-03-19 10:38:30 +0100 (Wed, 19 Mar 2014) New Revision: 1157 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1157 Log: bye-bye COBOL-85 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/CommonService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2014-03-17 16:32:22 UTC (rev 1156) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2014-03-19 09:38:30 UTC (rev 1157) @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Properties; +import fr.ifremer.coser.CoserConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -469,4 +470,40 @@ setOutputSpeciesType(SpeciesFieldType.C_Valide); } } + + /** + * Retourne le nom de stockage d'un fichier de données suivant la categories + * de fichier demandé. Les fichiers sont stockés avec leurs noms originaux + * (sauf les fichiers de réference) donc il n'est pas fixe. + * + * @param category category to get file name + * @param suffix suffix to add into file name + * @return storage file name + * @since 1.5 + */ + public String getDataStorageFileName(CoserConstants.Category category, String suffix) { + + String result = null; + + switch (category) { + case CATCH: + result = getCatchFileName(); + break; + case HAUL: + result = getHaulFileName(); + break; + case LENGTH: + result = getLengthFileName(); + break; + case STRATA: + result = getStrataFileName(); + break; + } + + if (suffix != null) { + result = CoserUtils.addSuffixBeforeExtension(result, suffix); + } + + return result; + } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/CommonService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/CommonService.java 2014-03-17 16:32:22 UTC (rev 1156) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/CommonService.java 2014-03-19 09:38:30 UTC (rev 1157) @@ -473,30 +473,12 @@ * @param category category to get file name * @param suffix suffix to add into file name * @return storage file name + * @deprecated since 1.5, use now {@link Project#getDataStorageFileName(Category, String)} */ + @Deprecated protected String getDataStorageFileName(Project project, Category category, String suffix) { - String result = null; - - switch (category) { - case CATCH: - result = project.getCatchFileName(); - break; - case HAUL: - result = project.getHaulFileName(); - break; - case LENGTH: - result = project.getLengthFileName(); - break; - case STRATA: - result = project.getStrataFileName(); - break; - } - - if (suffix != null) { - result = CoserUtils.addSuffixBeforeExtension(result, suffix); - } - + String result = project.getDataStorageFileName(category, suffix); return result; }