January 2011 - Coser-commits - mailman.cloud.codelutin.com

r587 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 26 Jan '11

26 Jan '11

Author: chatellier Date: 2011-01-26 15:10:40 +0000 (Wed, 26 Jan 2011) New Revision: 587 Log: Fix dataAllowed condition. Fix meta file name in zip. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 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-26 15:09:45 UTC (rev 586) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-26 15:10:40 UTC (rev 587) @@ -1634,7 +1634,8 @@ baseDir.mkdirs(); File csvFile = publicationService.getRsufiResultComChartData(resultDirectory, rSufiResult, indicator); - FileUtils.copyFileToDirectory(csvFile, baseDir); + File csvFileCopied = new File(baseDir, indicator + ".csv"); + FileUtils.copyFile(csvFile, csvFileCopied); // ajout du fichier d'information sur les espèces incluses dans // les calculs des indicateurs de communautés @@ -1642,7 +1643,8 @@ Project project = projectService.openProject(projectDirectory.getName(), projectsDirectory); Selection selection = project.getSelections().get(selectionDirectory.getName()); File metaFile = generateMetaFilePDF(project, selection, resultDirectory, rSufiResult, indicator, locale); - FileUtils.copyFileToDirectory(metaFile, baseDir); + File metaFileCopied = new File(baseDir, "Information.pdf"); + FileUtils.copyFile(metaFile, metaFileCopied); // make zip result = File.createTempFile("coserchartdatazip-", ".zip"); @@ -1879,7 +1881,7 @@ */ protected File generateSourceZip(Project project, Selection selection, File resultDirectory, RSufiResult rSufiResult) throws CoserBusinessException { - if (rSufiResult.isDataAllowed()) { + if (!rSufiResult.isDataAllowed()) { throw new CoserBusinessException("Can't download source for non allowed result"); } @@ -2037,7 +2039,10 @@ // get indicator full name String indicatorName = (String)getIndicatorsMap().get(indicatorCode, locale); - indicatorList.add(indicatorName); + // peut arriver pour les indicateurs inconnu par coser + if (indicatorName != null) { + indicatorList.add(indicatorName); + } } // seconde pass, remplit la map speciesMap avec les listes configurées @@ -2071,7 +2076,7 @@ Integer[] bound = speciesTypeEntry.getValue(); if (speciesNumSys >= bound[0] && speciesNumSys <= bound[1]) { - speciesName = speciesTypeCode + " : " + speciesName; + speciesName += " : " + speciesTypeCode; break; } } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-26 15:09:45 UTC (rev 586) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-26 15:10:40 UTC (rev 587) @@ -136,7 +136,7 @@ public void testSourceZipError() throws CoserBusinessException, IOException { registerUploadedResult("/web/upload2.zip"); - webService.getSourceZip("testzone1", "en"); + webService.getSourceZip("ecorse", "en"); } /** @@ -151,7 +151,7 @@ public void testSourceZip() throws CoserBusinessException, IOException { registerUploadedResult("/web/upload2.zip"); - File zip = webService.getSourceZip("ecorse", "en"); + File zip = webService.getSourceZip("testzone1", "en"); File tempDir = FileUtil.createTempDirectory("coser", ".tmp"); ZipUtil.uncompress(zip, tempDir); Assert.assertTrue(new File(tempDir, "projet1" + File.separator + "testcatch.csv").isFile());

1 0

r586 - trunk/coser-business/src/main/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org 26 Jan '11

26 Jan '11

Author: chatellier Date: 2011-01-26 15:09:45 +0000 (Wed, 26 Jan 2011) New Revision: 586 Log: Update header Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2011-01-26 10:18:08 UTC (rev 585) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2011-01-26 15:09:45 UTC (rev 586) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as

1 0

r585 - in trunk/coser-web/src/main/webapp/WEB-INF/content: . source
by chatellier＠users.labs.libre-entreprise.org 26 Jan '11

26 Jan '11

Author: chatellier Date: 2011-01-26 10:18:08 +0000 (Wed, 26 Jan 2011) New Revision: 585 Log: Fix admin email link Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/quality.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-quality.jsp Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/quality.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/quality.jsp 2011-01-26 09:58:48 UTC (rev 584) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/quality.jsp 2011-01-26 10:18:08 UTC (rev 585) @@ -40,7 +40,7 @@ </ul> <p> <s:text name="message.quality.paragraph5"> - <s:param value="adminEmail"/> + <s:param><a href="mailto:<s:property value='adminEmail' />"><s:property value='adminEmail' /></a></s:param> </s:text> </p> </body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-quality.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-quality.jsp 2011-01-26 09:58:48 UTC (rev 584) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/source/source-quality.jsp 2011-01-26 10:18:08 UTC (rev 585) @@ -42,7 +42,7 @@ </ul> <p> <s:text name="message.quality.paragraph5"> - <s:param value="adminEmail"/> + <s:param><a href="mailto:<s:property value='adminEmail' />"><s:property value='adminEmail' /></a></s:param> </s:text> </p>

1 0

r584 - in trunk: coser-ui/src/main/resources coser-web/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 26 Jan '11

26 Jan '11

Author: chatellier Date: 2011-01-26 09:58:48 +0000 (Wed, 26 Jan 2011) New Revision: 584 Log: Move log file to info loglevel Modified: trunk/coser-ui/src/main/resources/log4j.properties trunk/coser-web/src/main/resources/log4j.properties Modified: trunk/coser-ui/src/main/resources/log4j.properties =================================================================== --- trunk/coser-ui/src/main/resources/log4j.properties 2011-01-26 09:47:59 UTC (rev 583) +++ trunk/coser-ui/src/main/resources/log4j.properties 2011-01-26 09:58:48 UTC (rev 584) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric +# Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -38,4 +38,4 @@ log4j.appender.file.layout.ConversionPattern=%d{dd-MM-yy HH:mm:ss} %5p %c:%L - %m%n # Specific logging -#log4j.category.fr.ifremer.coser=DEBUG +log4j.category.fr.ifremer.coser=INFO Modified: trunk/coser-web/src/main/resources/log4j.properties =================================================================== --- trunk/coser-web/src/main/resources/log4j.properties 2011-01-26 09:47:59 UTC (rev 583) +++ trunk/coser-web/src/main/resources/log4j.properties 2011-01-26 09:58:48 UTC (rev 584) @@ -3,7 +3,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric +# Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by

1 0

r583 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 26 Jan '11

26 Jan '11

Author: chatellier Date: 2011-01-26 09:47:59 +0000 (Wed, 26 Jan 2011) New Revision: 583 Log: Remove one option (confusion) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-26 09:25:59 UTC (rev 582) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-26 09:47:59 UTC (rev 583) @@ -175,7 +175,8 @@ // category main modelBuilder.addCategory(_("coser.config.category.path"), _("coser.config.category.path.description")); - modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.DATABASE_DIRECTORY); + // chatellier 20110126 option genante + //modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.DATABASE_DIRECTORY); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.PROJECTS_DIRECTORY); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_SPECIES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_TYPE_ESPECES);

1 0

r582 - trunk/coser-business/src/main/resources/ftl
by chatellier＠users.labs.libre-entreprise.org 26 Jan '11

26 Jan '11

Author: chatellier Date: 2011-01-26 09:25:59 +0000 (Wed, 26 Jan 2011) New Revision: 582 Log: Fix last , Modified: trunk/coser-business/src/main/resources/ftl/metainfo.ftl Modified: trunk/coser-business/src/main/resources/ftl/metainfo.ftl =================================================================== --- trunk/coser-business/src/main/resources/ftl/metainfo.ftl 2011-01-26 09:15:52 UTC (rev 581) +++ trunk/coser-business/src/main/resources/ftl/metainfo.ftl 2011-01-26 09:25:59 UTC (rev 582) @@ -13,7 +13,7 @@ <#list indicatorsMap.keySet() as indicatorId> <h3> <#list indicatorsMap.get(indicatorId) as indicator> - ${indicator}, + ${indicator}<#if indicator_has_next>,</#if> </#list> </h3>

1 0

r581 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 26 Jan '11

26 Jan '11

Author: chatellier Date: 2011-01-26 09:15:52 +0000 (Wed, 26 Jan 2011) New Revision: 581 Log: Fix community meta file generation (with tests) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 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-26 09:15:32 UTC (rev 580) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-26 09:15:52 UTC (rev 581) @@ -1646,7 +1646,7 @@ // make zip result = File.createTempFile("coserchartdatazip-", ".zip"); - //result.deleteOnExit(); + result.deleteOnExit(); ZipUtil.compress(result, baseDir); // clean directory

1 0

r580 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services test/resources/web
by chatellier＠users.labs.libre-entreprise.org 26 Jan '11

26 Jan '11

Author: chatellier Date: 2011-01-26 09:15:32 +0000 (Wed, 26 Jan 2011) New Revision: 580 Log: Fix community meta file generation (with tests) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java trunk/coser-business/src/test/resources/web/upload1.zip trunk/coser-business/src/test/resources/web/upload2.zip 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-25 22:43:11 UTC (rev 579) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-26 09:15:32 UTC (rev 580) @@ -1646,7 +1646,7 @@ // make zip result = File.createTempFile("coserchartdatazip-", ".zip"); - result.deleteOnExit(); + //result.deleteOnExit(); ZipUtil.compress(result, baseDir); // clean directory @@ -2019,9 +2019,9 @@ // Campagne Indicateur Liste Strate Annee Estimation EcartType CV DataStorage dataStorage = importService.loadCSVFile(estComIndFile, CoserConstants.CSV_RESULT_SEPARATOR_CHAR); - Iterator<String[]> estPopIndIterator = dataStorage.iterator(true); - while (estPopIndIterator.hasNext()) { - String[] tuple = estPopIndIterator.next(); + Iterator<String[]> estComIndIterator = dataStorage.iterator(true); + while (estComIndIterator.hasNext()) { + String[] tuple = estComIndIterator.next(); String indicatorCode = tuple[1]; String listIdCode = tuple[2]; // c1, p2, T3 ... @@ -2029,7 +2029,7 @@ String listNumber = listIdCode.substring(1); // 1, 2, 3 // get indicator list - SortedSet<String> indicatorList = indicatorMap.get(listIdCode); + SortedSet<String> indicatorList = indicatorMap.get(listNumber); if (indicatorList == null) { indicatorList = new TreeSet<String>(); indicatorMap.put(listNumber, indicatorList); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2011-01-25 22:43:11 UTC (rev 579) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2011-01-26 09:15:32 UTC (rev 580) @@ -82,7 +82,7 @@ config = new CoserBusinessConfig(); config.setDatabaseDirectory(testDirectory.getAbsolutePath()); - I18n.init(Locale.UK); + I18n.init(null, Locale.UK); FileUtils.copyDirectory(new File("src" + File.separator + "test" + File.separator + "resources", "projects"), @@ -104,7 +104,7 @@ @AfterClass public static void cleanDirectory() throws IOException { - //FileUtils.deleteDirectory(testDirectory); + FileUtils.deleteDirectory(testDirectory); } /** Modified: trunk/coser-business/src/test/resources/web/upload1.zip =================================================================== (Binary files differ) Modified: trunk/coser-business/src/test/resources/web/upload2.zip =================================================================== (Binary files differ)

1 0

r579 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 22:43:11 +0000 (Tue, 25 Jan 2011) New Revision: 579 Log: Ajout du nouveau calcul de fichier meta des indicateurs de communaut?\195?\169s Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 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-25 21:45:27 UTC (rev 578) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-25 22:43:11 UTC (rev 579) @@ -1589,7 +1589,7 @@ // extraction des especes pour le résultat demandé if (rsufiResult.getZone() != null && rsufiResult.getZone().equals(zone)) { - result = getChartDataFile(resultFile, rsufiResult, species, indicator); + result = getChartDataFile(projectsDirectory, projectFile, selectionFile, resultFile, rsufiResult, species, indicator, locale); break; } } @@ -1608,14 +1608,19 @@ /** * Generate chart data (as csv for population and as zip for community). * + * @param projectsDirectory projects storage directory + * @param projectDirectory current project directory + * @param selectionDirectory selection directory * @param resultDirectory rsufi result directory * @param rSufiResult rsufi result * @param string species species (can be null for community) * @param indicator indicator + * @param locale locale (fr/en) * @return generated file (auto delete when jvm shutdown) * @throws CoserBusinessException */ - protected File getChartDataFile(File resultDirectory, RSufiResult rSufiResult, String species, String indicator) throws CoserBusinessException { + protected File getChartDataFile(File projectsDirectory, File projectDirectory, File selectionDirectory, + File resultDirectory, RSufiResult rSufiResult, String species, String indicator, String locale) throws CoserBusinessException { File result = null; @@ -1632,11 +1637,13 @@ FileUtils.copyFileToDirectory(csvFile, baseDir); // ajout du fichier d'information sur les espèces incluses dans - //les calculs des indicateurs de communautés + // les calculs des indicateurs de communautés // load project (without data to get reftax data) - //Project project = projectService.openProject(projectFile.getName(), projectsDirectory); - //File metaFile = generateMetaFilePDF(project, resultFile, rsufiResult, indicator, locale); - + Project project = projectService.openProject(projectDirectory.getName(), projectsDirectory); + Selection selection = project.getSelections().get(selectionDirectory.getName()); + File metaFile = generateMetaFilePDF(project, selection, resultDirectory, rSufiResult, indicator, locale); + FileUtils.copyFileToDirectory(metaFile, baseDir); + // make zip result = File.createTempFile("coserchartdatazip-", ".zip"); result.deleteOnExit(); @@ -1962,6 +1969,7 @@ * calculs des indicateurs de communautés, à jointe à chaque téléchargement. * * @param project project + * @param selection selection * @param resultDirectory result directory * @param rsufiResult rsufi result * @param indicator indicator @@ -1969,50 +1977,115 @@ * @return generated pdf file * @throws CoserBusinessException */ - protected File generateMetaFilePDF(Project project, File resultDirectory, + protected File generateMetaFilePDF(Project project, Selection selection, File resultDirectory, RSufiResult rsufiResult, String indicator, String locale) throws CoserBusinessException { File result = null; + // chargement du reftax et des code types especes pour connaitre + // le type des especes de poissons + // parcourt du fichier des types de données + Map<String, Integer> refTaxSpecies = new HashMap<String, Integer>(); + Iterator<String[]> itReftax = project.getRefTaxSpecies().iterator(true); + while (itReftax.hasNext() ) { + String[] tuple = itReftax.next(); + // "C_Perm","NumSys","NivSys","C_VALIDE","L_VALIDE","AA_VALIDE","C_TxP\u00E8re","Taxa" + String specyName = tuple[3]; + Integer iNumSys = Integer.valueOf(tuple[1]); + refTaxSpecies.put(specyName, iNumSys); + } + + Map<String, Integer[]> specyTypes = new HashMap<String, Integer[]>(); + Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(true); + while (itTypeSpecies.hasNext()) { + // "Types";"Commentaire";"NumSys min";"NumSys max","Code" + String[] tuple = itTypeSpecies.next(); + String specyTypeCode = tuple[4]; + + Integer iMinNumSys = Integer.valueOf(tuple[2]); + Integer iMaxNumSys = Integer.valueOf(tuple[3]); + specyTypes.put(specyTypeCode, new Integer[]{iMinNumSys, iMaxNumSys}); + } + // le fichier estpopind - File estPopIndFile = new File(resultDirectory, rsufiResult.getEstPopIndName()); + File estComIndFile = new File(resultDirectory, rsufiResult.getEstComIndName()); // donnees intermediare (map liste id > liste des indicateurs) Map<String, SortedSet<String>> indicatorMap = new HashMap<String, SortedSet<String>>(); // le resutat sera une map complexe - // list des indicateurs (nom complet) > liste des especes (nom complet) + // map liste id > liste des especes (nom complet) Map<String, SortedSet<String>> speciesMap = new HashMap<String, SortedSet<String>>(); - // Campagne Indicateur Liste Species Strate Annee Estimation EcartType CV - DataStorage dataStorage = importService.loadCSVFile(estPopIndFile, CoserConstants.CSV_RESULT_SEPARATOR_CHAR); + // Campagne Indicateur Liste Strate Annee Estimation EcartType CV + DataStorage dataStorage = importService.loadCSVFile(estComIndFile, CoserConstants.CSV_RESULT_SEPARATOR_CHAR); Iterator<String[]> estPopIndIterator = dataStorage.iterator(true); while (estPopIndIterator.hasNext()) { String[] tuple = estPopIndIterator.next(); String indicatorCode = tuple[1]; - String listIdCode = tuple[2]; - String speciesCode = tuple[3]; + String listIdCode = tuple[2]; // c1, p2, T3 ... + String listNumber = listIdCode.substring(1); // 1, 2, 3 + // get indicator list SortedSet<String> indicatorList = indicatorMap.get(listIdCode); if (indicatorList == null) { indicatorList = new TreeSet<String>(); - indicatorMap.put(listIdCode, indicatorList); + indicatorMap.put(listNumber, indicatorList); } // get indicator full name String indicatorName = (String)getIndicatorsMap().get(indicatorCode, locale); indicatorList.add(indicatorName); + } + + // seconde pass, remplit la map speciesMap avec les listes configurées + // dans la selection + for (String listNumber : indicatorMap.keySet()) { + List<String> selectionSpeciesList = null; + if ("1".equals(listNumber)) { + selectionSpeciesList = selection.getSelectedSpecies(); + } + else if ("2".equals(listNumber)) { + selectionSpeciesList = selection.getSelectedSpeciesOccDens(); + } + else if ("3".equals(listNumber)) { + selectionSpeciesList = selection.getSelectedSpeciesSizeAllYear(); + } + else if ("4".equals(listNumber)) { + selectionSpeciesList = selection.getSelectedSpeciesMaturity(); + } - // get species full name - String speciesName = projectService.getSpeciesDisplayName(project, speciesCode); - SortedSet<String> speciesList = speciesMap.get(listIdCode); - if (speciesList == null) { - speciesList = new TreeSet<String>(); - speciesMap.put(listIdCode, speciesList); + if (selectionSpeciesList != null) { + SortedSet<String> speciesList = new TreeSet<String>(); + + for (String speciesCode : selectionSpeciesList) { + // get species full name + String speciesName = projectService.getSpeciesDisplayName(project, speciesCode); + + // recupere le code type de l'espece, "m", "c", "p" ... + Integer speciesNumSys = refTaxSpecies.get(speciesCode); + for (Map.Entry<String, Integer[]> speciesTypeEntry : specyTypes.entrySet()) { + String speciesTypeCode = speciesTypeEntry.getKey(); + Integer[] bound = speciesTypeEntry.getValue(); + + if (speciesNumSys >= bound[0] && speciesNumSys <= bound[1]) { + speciesName = speciesTypeCode + " : " + speciesName; + break; + } + } + // end code type espece + + speciesList.add(speciesName); + } + speciesMap.put(listNumber, speciesList); } - speciesList.add(speciesName); + else { + if (log.isWarnEnabled()) { + log.warn("Can't get species list for list id " + listNumber); + } + } } try {

1 0

r578 - in trunk: coser-ui/src/main/java/fr/ifremer/coser coser-web/src/main/java/fr/ifremer/coser/web
by chatellier＠users.labs.libre-entreprise.org 25 Jan '11

25 Jan '11

Author: chatellier Date: 2011-01-25 21:45:27 +0000 (Tue, 25 Jan 2011) New Revision: 578 Log: Fix deprecated code Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2011-01-25 20:54:37 UTC (rev 577) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2011-01-25 21:45:27 UTC (rev 578) @@ -106,8 +106,7 @@ public static void launch(final CoserConfig coserConfig) { // to work in java webstart - I18n.setInitializer(new DefaultI18nInitializer("coser-ui-i18n")); - I18n.init(coserConfig.getLocale()); + I18n.init(new DefaultI18nInitializer("coser-ui-i18n"), coserConfig.getLocale()); // launch UI SwingUtilities.invokeLater(new Runnable() { Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2011-01-25 20:54:37 UTC (rev 577) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2011-01-25 21:45:27 UTC (rev 578) @@ -22,6 +22,8 @@ package fr.ifremer.coser.web; +import java.util.Locale; + import org.nuiton.i18n.I18n; import org.nuiton.util.ArgumentsParserException; @@ -44,7 +46,7 @@ static { // on a pas trop de locale là :( - I18n.init(); + I18n.init(null, (Locale)null); } /**

1 0