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

r477 - trunk/coser-business/src/main/java/fr/ifremer/coser/storage
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 13:19:35 +0000 (Thu, 06 Jan 2011) New Revision: 477 Log: Ajout d'une nouvelle methode iterator() qui skip le header csv. Update doc Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/DataStorage.java trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/DataStorage.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/DataStorage.java 2011-01-06 12:59:40 UTC (rev 476) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/DataStorage.java 2011-01-06 13:19:35 UTC (rev 477) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 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 @@ -25,13 +25,14 @@ package fr.ifremer.coser.storage; +import java.util.Iterator; import java.util.List; /** * Data storage utiliser pour manipuler dans l'application des * tableau de String, mais les stocker en back différement. * - * Cet interface respecte globalement l'interface d'une {@link List}. + * Cette interface respecte globalement l'interface d'une {@link List}. * * @author chatellier * @version $Revision$ @@ -46,7 +47,7 @@ * * @param data data to add */ - void add(String[] data); + public void add(String[] data); /** * Add new data into storage. @@ -54,7 +55,7 @@ * @param index index to insert data * @param data data to add */ - void add(int index, String[] data); + public void add(int index, String[] data); /** * Get data at specified index. @@ -62,13 +63,46 @@ * @param index index * @return data at index */ - String[] get(int index); - - int size(); + public String[] get(int index); - String[] set(int index, String[] data); - - String[] remove(int index); - + /** + * Storage size. + * + * @return storage size + */ + public int size(); + + /** + * Replace data at specified index. + * + * @param index index + * @param data data to set + * @return previous value + */ + public String[] set(int index, String[] data); + + /** + * Remove value at index. + * + * @param index index + * @return removed value + */ + public String[] remove(int index); + + /** + * Real storage index of lineNumber. + * + * @param lineNumber line number + * @return storage index + */ public int indexOf(String lineNumber); + + /** + * Return a new iterator, but skip first iterator element (csv header) + * by calling {@code next()} once. + * + * @param skipFirstLine if {@code true}, skip first line + * @return an Iterator. + */ + public Iterator<String[]> iterator(boolean skipFirstLine); } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-06 12:59:40 UTC (rev 476) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-06 13:19:35 UTC (rev 477) @@ -121,6 +121,7 @@ * @param skipFirstLine if {@code true}, skip first line * @return an Iterator. */ + @Override public Iterator<String[]> iterator(boolean skipFirstLine) { Iterator<String[]> iterator = new StringListIterator(listStorage.iterator(), lineIndexStorage.iterator()); if (skipFirstLine) {

1 0

r476 - trunk/coser-business/src/main/java/fr/ifremer/coser/storage
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 12:59:40 +0000 (Thu, 06 Jan 2011) New Revision: 476 Log: Ajout d'une nouvelle methode iterator() qui skip le header csv Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-06 12:42:35 UTC (rev 475) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-06 12:59:40 UTC (rev 476) @@ -25,16 +25,10 @@ package fr.ifremer.coser.storage; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import au.com.bytecode.opencsv.CSVReader; -import au.com.bytecode.opencsv.CSVWriter; - /** * Stockage mémoire des String[] sous forme de String simple. * @@ -117,9 +111,24 @@ */ @Override public Iterator<String[]> iterator() { - return new StringListIterator(listStorage.iterator(), lineIndexStorage.iterator()); + return iterator(false); } + /** + * Return a new iterator, but skip first iterator element (csv header) + * by calling {@code next()} once. + * + * @param skipFirstLine if {@code true}, skip first line + * @return an Iterator. + */ + public Iterator<String[]> iterator(boolean skipFirstLine) { + Iterator<String[]> iterator = new StringListIterator(listStorage.iterator(), lineIndexStorage.iterator()); + if (skipFirstLine) { + iterator.next(); // skip header + } + return iterator; + } + /* * @see fr.ifremer.coser.storage.DataStorage#addData(java.lang.String[]) */

1 0

r475 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 12:42:35 +0000 (Thu, 06 Jan 2011) New Revision: 475 Log: Add doc Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2011-01-06 12:37:49 UTC (rev 474) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2011-01-06 12:42:35 UTC (rev 475) @@ -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 General Public License as @@ -112,10 +112,12 @@ // project layer if (project.getMaps() != null) { for (File map : project.getMaps()) { + // le fond de carte a une couleur vert/contour noir if (map.getName().equals("cntry00.shp")) { addLayer(map.getAbsolutePath(), map.getAbsolutePath(), "ff000000", "ffbdde83"); } else { + // les autres rouge (contour noir) addLayer(map.getAbsolutePath(), map.getAbsolutePath(), "ff000000", "ffE55B3C"); } }

1 0

r474 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 12:37:49 +0000 (Thu, 06 Jan 2011) New Revision: 474 Log: Gestion d'un layer world alternatif "cntry00.shp" Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2011-01-06 10:40:19 UTC (rev 473) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2011-01-06 12:37:49 UTC (rev 474) @@ -92,13 +92,32 @@ // graticule layer addGraticuleLayer(); - // world layer - addLayer("maps/vmap_area_thin.shp", "maps/vmap_area_thin.shp", "ff000000", "ffbdde83"); + // world layer, affiche si la liste des maps utilsateur + // ne contient pas une carte nommée cntry00.shp (carte du monde + // sans fuseau horaire) + boolean cntrOOShapeFound = false; + if (project.getMaps() != null) { + for (File map : project.getMaps()) { + if (map.getName().equals("cntry00.shp")) { + cntrOOShapeFound = true; + } + } + } + // avant du world layer avant les autres + if (!cntrOOShapeFound) { + addLayer("maps/vmap_area_thin.shp", "maps/vmap_area_thin.shp", "ff000000", "ffbdde83"); + } + // project layer if (project.getMaps() != null) { for (File map : project.getMaps()) { - addLayer(map.getAbsolutePath(), map.getAbsolutePath(), "ff000000", "ffE55B3C"); + if (map.getName().equals("cntry00.shp")) { + addLayer(map.getAbsolutePath(), map.getAbsolutePath(), "ff000000", "ffbdde83"); + } + else { + addLayer(map.getAbsolutePath(), map.getAbsolutePath(), "ff000000", "ffE55B3C"); + } } } }

1 0

r473 - in trunk/coser-business/src/test: java/fr/ifremer/coser/services resources/projects/projectctrvalidated/selections/testselection1 resources/projects/projectctrvalidated/selections/testselection1/results resources/projects/projectctrvalidated/selections/testselection1/results/testresult1
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 10:40:19 +0000 (Thu, 06 Jan 2011) New Revision: 473 Log: Ajout d'un test sur les r?\195?\169sultats Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstComInd_test.txt trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstPopInd_test.txt trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/result.properties Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2011-01-06 10:30:58 UTC (rev 472) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2011-01-06 10:40:19 UTC (rev 473) @@ -42,6 +42,7 @@ import fr.ifremer.coser.CoserConstants; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.RSufiResult; import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.command.DeleteLineCommand; @@ -121,9 +122,16 @@ Assert.assertEquals(1, selection.getHistoryCommand().size()); // un merge Assert.assertEquals("Test selectedSpeciesOccDensComment", selection.getSelectedSpeciesOccDensComment()); Assert.assertEquals(3.5, selection.getDensityFilter(), 0); - + + // un resultat + RSufiResult rSufiResult = selection.getRsufiResults().get(0); + Assert.assertEquals("testresult1", rSufiResult.getName()); + Assert.assertEquals("myzone", rSufiResult.getZone()); + + // non validé Project projectNotValidated = openTestProject(projectService, "project2"); Assert.assertFalse(projectNotValidated.getControl().isValidated()); + } /** Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstComInd_test.txt =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstComInd_test.txt (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstComInd_test.txt 2011-01-06 10:40:19 UTC (rev 473) @@ -0,0 +1,8 @@ +Campagne Indicateur Liste Strate Annee Estimation EcartType CV +COSER_TEST Delta m1 Total 2005 0.00158515572607873 0.000984730247180753 0.621219878261882 +COSER_TEST Delta m1 Total 2009 0.0476283033138584 0.0151443086213752 0.317968677607053 +COSER_TEST Delta c1 Total 2005 0.00646357387617557 0.00215034288588182 0.332686363160152 +COSER_TEST Delta c1 Total 2009 0.0695548460030265 0.0185708842538978 0.266996267277908 +COSER_TEST Delta p1 Total 1983 0.737241187520257 0.00659773901507874 0.00894922737194123 +COSER_TEST Delta p1 Total 1986 0.730696719394954 0.0192883714063304 0.0263972327976263 + Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstPopInd_test.txt =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstPopInd_test.txt (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/EstPopInd_test.txt 2011-01-06 10:40:19 UTC (rev 473) @@ -0,0 +1,7 @@ +Campagne Indicateur Liste Espece Strate Annee Estimation EcartType CV +COSER_TEST lnN L2 COSER_SPECIES1 Total 2001 16.5576325818007 0.1654168567871 0.00999036885073279 +COSER_TEST lnN L3 COSER_SPECIES2 Total 1999 18.4833935818621 0.0287121599216956 0.00155340304768877 +COSER_TEST Wbar L2 COSER_SPECIES1 Total 1983 0.0220057182719674 0.000818725789680143 0.0372051382082402 +COSER_TEST Abundance L2 COSER_SPECIES2 Total 1983 6334938.17950327 235692.250509076 0.0372051382082401 +COSER_TEST Biomass L2 COSER_SPECIES1 Total 2007 4634200.30159478 2761107.91858038 0.595811086894581 + Added: trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/result.properties =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/result.properties (rev 0) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/selections/testselection1/results/testresult1/result.properties 2011-01-06 10:40:19 UTC (rev 473) @@ -0,0 +1,5 @@ +#Mon Jan 03 16:12:49 CET 2011 +result.rsufiversion=1.2.3 +result.zone=myzone +result.estPopIndName=EstPopInd_test.txt +result.estComIndName=EstComInd_test.txt

1 0

r472 - in trunk/coser-business/src/test/resources/projects: project2 projectctrvalidated
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 10:30:58 +0000 (Thu, 06 Jan 2011) New Revision: 472 Log: Prise en compte du nouveau fichier code type espece (code en plus) Modified: trunk/coser-business/src/test/resources/projects/project2/codeTypeEspeces.csv trunk/coser-business/src/test/resources/projects/projectctrvalidated/codeTypeEspeces.csv Modified: trunk/coser-business/src/test/resources/projects/project2/codeTypeEspeces.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/project2/codeTypeEspeces.csv 2011-01-06 10:29:52 UTC (rev 471) +++ trunk/coser-business/src/test/resources/projects/project2/codeTypeEspeces.csv 2011-01-06 10:30:58 UTC (rev 472) @@ -1,4 +1,4 @@ -"Types";"Commentaire";"NumSys min";"NumSys max" -"Type1";;"00001";"00002" -"Type2";;"00003";"00005" -"Type3";;"00006";"00010" +"Types";"Commentaire";"NumSys min";"NumSys max";"Code" +"Type1";;"00001";"00002";"a" +"Type2";;"00003";"00005";"m" +"Type3";;"00006";"00010";"p" Modified: trunk/coser-business/src/test/resources/projects/projectctrvalidated/codeTypeEspeces.csv =================================================================== --- trunk/coser-business/src/test/resources/projects/projectctrvalidated/codeTypeEspeces.csv 2011-01-06 10:29:52 UTC (rev 471) +++ trunk/coser-business/src/test/resources/projects/projectctrvalidated/codeTypeEspeces.csv 2011-01-06 10:30:58 UTC (rev 472) @@ -1,4 +1,4 @@ -"Types";"Commentaire";"NumSys min";"NumSys max" -"Type1";;"00001";"00002" -"Type2";;"00003";"00005" -"Type3";;"00006";"00010" +"Types";"Commentaire";"NumSys min";"NumSys max";"Code" +"Type1";;"00001";"00002";"a" +"Type2";;"00003";"00005";"m" +"Type3";;"00006";"00010";"p"

1 0

r471 - trunk/coser-business/src/test/resources/csv/correct
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 10:29:52 +0000 (Thu, 06 Jan 2011) New Revision: 471 Log: Prise en compte du nouveau fichier code type espece (code en plus) Modified: trunk/coser-business/src/test/resources/csv/correct/testtypeespeces.csv Modified: trunk/coser-business/src/test/resources/csv/correct/testtypeespeces.csv =================================================================== --- trunk/coser-business/src/test/resources/csv/correct/testtypeespeces.csv 2011-01-06 10:26:42 UTC (rev 470) +++ trunk/coser-business/src/test/resources/csv/correct/testtypeespeces.csv 2011-01-06 10:29:52 UTC (rev 471) @@ -1,4 +1,4 @@ -"Types";"Commentaire";"NumSys min";"NumSys max" -"Type1";;"00001";"00002" -"Type2";;"00003";"00005" -"Type3";;"00006";"00010" +"Types";"Commentaire";"NumSys min";"NumSys max";"Code" +"Type1";;"00001";"00002";"a" +"Type2";;"00003";"00005";"m" +"Type3";;"00006";"00010";"p"

1 0

r470 - in trunk/coser-business/src/main/java/fr/ifremer/coser: bean services
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 10:26:42 +0000 (Thu, 06 Jan 2011) New Revision: 470 Log: Prise en compte du nouveau fichier code type espece (code en plus) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.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 2011-01-06 10:26:02 UTC (rev 469) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2011-01-06 10:26:42 UTC (rev 470) @@ -62,7 +62,7 @@ }; public static final String[] TYPE_ESPECE_HEADER = { - "Types","Commentaire","NumSys min","NumSys max" + "Types","Commentaire","NumSys min","NumSys max","Code" }; public static final String PROPERTY_SELECTIONS = "selections"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-01-06 10:26:02 UTC (rev 469) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-01-06 10:26:42 UTC (rev 470) @@ -907,7 +907,7 @@ Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(); itTypeSpecies.next(); // skip header while (itTypeSpecies.hasNext()) { - // "Types";"Commentaire";"NumSys min";"NumSys max" + // "Types";"Commentaire";"NumSys min";"NumSys max","Code" String[] tuple = itTypeSpecies.next(); String specyType = tuple[0]; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-06 10:26:02 UTC (rev 469) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-06 10:26:42 UTC (rev 470) @@ -1609,7 +1609,7 @@ /** * Retourne la liste des type d'especes definie dans le projet sous forme - * de map avec leur commentaire. + * de map avec leur commentaire (sauf "Tous"). * * @param project project to search into * @return project species type @@ -1617,7 +1617,7 @@ public Map<String, String> getProjectSpeciesTypes(Project project) { SortedMap<String, String> types = new TreeMap<String, String>(); - // "Types","Commentaire","NumSys min","NumSys max" + // "Types","Commentaire","NumSys min","NumSys max","Code" Iterator<String[]> itTuples = project.getTypeEspeces().iterator(); itTuples.next(); // skip headers @@ -1627,7 +1627,13 @@ String type = tuple[0]; String comment = tuple[1]; - types.put(type, comment); + String numSysMin = tuple[2]; + String numSysMax = tuple[3]; + + // pour le cas "Tous", min est max sont a 0, donc pas filtrable + if (!numSysMin.equals(numSysMax)) { + types.put(type, comment); + } } return types; @@ -1830,7 +1836,7 @@ Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(); itTypeSpecies.next(); // skip header while (itTypeSpecies.hasNext()) { - // "Types";"Commentaire";"NumSys min";"NumSys max" + // "Types";"Commentaire";"NumSys min";"NumSys max","Code" String[] tuple = itTypeSpecies.next(); String specyType = tuple[0];

1 0

r469 - trunk/coser-business/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 10:26:02 +0000 (Thu, 06 Jan 2011) New Revision: 469 Log: Update i18n Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-06 10:02:18 UTC (rev 468) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-06 10:26:02 UTC (rev 469) @@ -104,8 +104,10 @@ coser.config.selection.occurrenceFilter.description=Default occurrence filter value coser.config.validator.directory.description=Validation files directory location coser.config.web.frontend.description=Coser server url +coser.config.web.matchindicators.file.description=Indicators match file +coser.config.web.matchzones.file.description=Zones match file +coser.config.web.projects.directory.description=Web projects storage directory coser.config.web.server.directory.description=Coser server storage directory -coser.config.web.uploadpassword.description=Coser server upload result admin password coser.config.web.uploadurl.description=Coser server upload result url depth\ attribute\ is\ not\ a\ valid\ double= haul\ name\ is\ not\ valid= Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-06 10:02:18 UTC (rev 468) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-06 10:26:02 UTC (rev 469) @@ -104,8 +104,10 @@ coser.config.selection.occurrenceFilter.description=Filtre par d\u00E9faut sur la moyenne des occurrences coser.config.validator.directory.description=Emplacement des fichiers de validations coser.config.web.frontend.description=Adresse du serveur web coser +coser.config.web.matchindicators.file.description=Fichier de correspondance des indicateurs +coser.config.web.matchzones.file.description=Fichier de correspondance des zones +coser.config.web.projects.directory.description=Dossier de stockage des projets pour le Web coser.config.web.server.directory.description=Dossier de stockage des projets sur le serveur -coser.config.web.uploadpassword.description=Mot de passe pour l'envoi des r\u00E9sultats coser.config.web.uploadurl.description=Adresse d'envoi des r\u00E9sultats depth\ attribute\ is\ not\ a\ valid\ double=L'attribut ProfMoy n'est pas un r\u00E9el valide haul\ name\ is\ not\ valid=L'attribut Trait n'est pas valide

1 0

r468 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui resources/i18n
by chatellier＠users.labs.libre-entreprise.org Jan. 6, 2011

Jan. 6, 2011

Author: chatellier Date: 2011-01-06 10:02:18 +0000 (Thu, 06 Jan 2011) New Revision: 468 Log: Move publication ui to his own menu. Change coser home view test. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-01-05 17:20:52 UTC (rev 467) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-01-06 10:02:18 UTC (rev 468) @@ -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 General Public License as @@ -28,27 +28,29 @@ <CoserFrameHandler id="handler" constructorParams="this" /> <fr.ifremer.coser.bean.Project id="project" javaBean="null" /> - <JMenuBar id='coserMenuBar'> + <JMenuBar> - <JMenu id='menuFile' text="coser.ui.mainframe.menu.file"> + <JMenu text="coser.ui.mainframe.menu.file"> <JMenuItem text="coser.ui.mainframe.menu.newProject" onActionPerformed="getHandler().showProjectCreationView()"/> <JMenuItem text="coser.ui.mainframe.menu.openProject" onActionPerformed="getHandler().showProjectOpenView()"/> <JMenuItem text="coser.ui.mainframe.menu.editProject" onActionPerformed="getHandler().showProjectEditView()" enabled="{getProject() != null}" /> <JMenuItem text="coser.ui.mainframe.menu.closeProject" onActionPerformed="getHandler().closeProject()" enabled="{getProject() != null}" /> <JSeparator/> - <JMenuItem text="coser.ui.mainframe.menu.uploadResult" onActionPerformed="getHandler().showUploadResultView()"/> - <JSeparator/> <JMenuItem text="coser.ui.mainframe.menu.quit" onActionPerformed="getHandler().quit()"/> </JMenu> - <JMenu id='menuWindow' text="coser.ui.mainframe.menu.data" enabled="{getProject() != null}"> + <JMenu text="coser.ui.mainframe.menu.data" enabled="{getProject() != null}"> <JMenuItem text="coser.ui.mainframe.menu.data.summary" onActionPerformed="getHandler().showSummaryView()"/> <JMenuItem text="coser.ui.mainframe.menu.data.control" onActionPerformed="getHandler().showControlView()"/> <SelectionsListMenuItem id="menuWindowSelectionMenuItem" project="{getProject()}" text="coser.ui.mainframe.menu.data.selections" constructorParams="this" /> </JMenu> + + <JMenu text="coser.ui.mainframe.menu.admin"> + <JMenuItem text="coser.ui.mainframe.menu.admin.publishResult" onActionPerformed="getHandler().showPublishResultView()"/> + </JMenu> - <JMenu id='menuOptions' text="coser.ui.mainframe.menu.options"> + <JMenu text="coser.ui.mainframe.menu.options"> <JMenuItem text="coser.ui.mainframe.menu.configuration" onActionPerformed="getHandler().showCoserConfiguration()"/> <JMenuItem text="coser.ui.mainframe.menu.validators" onActionPerformed="getHandler().showValidatorsConfiguration()" /> <JSeparator/> @@ -56,12 +58,12 @@ <JMenuItem actionIcon="i18n-gb" text="coser.ui.mainframe.menu.locale.uk" onActionPerformed="getHandler().switchLanguage(this, Locale.UK)"/> </JMenu> - <JMenu id='menuView' text="coser.ui.mainframe.menu.view"> + <JMenu text="coser.ui.mainframe.menu.view"> <fr.ifremer.coser.ui.widgets.LookAndFeelViewMenuItem text="coser.ui.mainframe.menu.view.lookandfeel" onPropertyChange="getHandler().saveLookAndFeelConfiguration(event)"/> </JMenu> - <JMenu id='menuHelp' text="coser.ui.mainframe.menu.help"> + <JMenu text="coser.ui.mainframe.menu.help"> <JMenuItem text="coser.ui.mainframe.menu.website" onActionPerformed="getHandler().showCoserWebsite()"/> </JMenu> </JMenuBar> 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-05 17:20:52 UTC (rev 467) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-06 10:02:18 UTC (rev 468) @@ -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 General Public License as @@ -182,7 +182,6 @@ modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_SPECIES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_TYPE_ESPECES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.WEB_FRONT_END); - modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.WEB_UPLOAD_PASSWORD); // category control modelBuilder.addCategory(_("coser.config.category.configuration"), _("coser.config.category.configuration.description")); @@ -499,9 +498,9 @@ } /** - * Display ui to select result to upload to website. + * Display ui to select result to upload to website or to export as archive. */ - public void showUploadResultView() { + public void showPublishResultView() { ProjectService projectService = view.getContextValue(ProjectService.class); List<String[]> results = projectService.findAllProjectWithResult(); Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-01-05 17:20:52 UTC (rev 467) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-01-06 10:02:18 UTC (rev 468) @@ -62,9 +62,11 @@ coser.ui.graph.compareNumberCatchLength=Comparison Catch/Length coser.ui.graph.compareNumberCatchLengthTip=Display catch and length number comparison graphs (data are generated only during error check) coser.ui.graph.lengthStructure=Length structure -coser.ui.home.text=Pro viri copia cum lassatis cuius inopia est sine provenisset pauloque frumentum horreis indolis consule provenisset actitatum provenisset segetum etiam provenisset negotium integre textum tempore copia sine viri sine negotium dedit regeret indolis dedit destinatis dedit destinatis provenisset Romano sine actitatum negotium sine iam provenisset sine Africam iam praeclarae copia cum Africam viri actitatum frumentum tempore victus Romano pauloque sine textum pro Africam praeclarae est actitatum copia restituit negotium esse indolis iam copia cum regeret novimus consule horreis frumentum indolis cum postea cuius lassatis cum indoli copia lassatis cum novimus mora ex praeclarae iam pro horreis Romano ex regeret indolis etiam. +coser.ui.home.text=<html><center>CoSeR Le logiciel Coser est con\u00E7u par l'Ifremer (projet Syst\u00E8me d'informations halieutiques) comme l'un des maillons d'une cha\u00EEne de traitement des donn\u00E9es des campagnes halieutiques pour calculer des indicateurs \u00E9cosyst\u00E9miques. Il se situe \u00E0 l'interface entre les donn\u00E9es extraites des bases de donn\u00E9es source des campagnes et le logiciel de calcul R-Sufi. Il remplit trois fonctions \: contr\u00F4le de qualit\u00E9 des donn\u00E9es, s\u00E9lection de jeux de donn\u00E9es coh\u00E9rents en r\u00E9f\u00E9rence aux objectifs de calcul et gestion de la m\u00E9ta-information relative aux traitements r\u00E9alis\u00E9s. Coser a \u00E9t\u00E9 cr\u00E9\u00E9 par Code Lutin avec des logiciels libres dans le cadre d'une convention Ifremer-MEEDDM 2010.</center></html> coser.ui.locale.mustRestart=You must restart application to take effect coser.ui.locale.title=Locale modification +coser.ui.mainframe.menu.admin=Admin +coser.ui.mainframe.menu.admin.publishResult=Results publication coser.ui.mainframe.menu.closeProject=Close project coser.ui.mainframe.menu.configuration=Configuration coser.ui.mainframe.menu.data=Data @@ -84,7 +86,6 @@ coser.ui.mainframe.menu.openProject=Open project coser.ui.mainframe.menu.options=Options coser.ui.mainframe.menu.quit=Quit -coser.ui.mainframe.menu.uploadResult=Results publication coser.ui.mainframe.menu.validators=Controls coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Look and feel Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-01-05 17:20:52 UTC (rev 467) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-01-06 10:02:18 UTC (rev 468) @@ -62,9 +62,11 @@ coser.ui.graph.compareNumberCatchLength=Comparaison Captures/Tailles coser.ui.graph.compareNumberCatchLengthTip=Affiche les graphiques de comparaison des nombres entre les captures et les tailles (Les donn\u00E9es sont g\u00E9n\u00E9r\u00E9es uniquement lors de la v\u00E9rification des erreurs) coser.ui.graph.lengthStructure=Structures en taille -coser.ui.home.text=<html><center>Pro viri copia cum lassatis cuius inopia est sine provenisset pauloque frumentum horreis indolis consule provenisset actitatum provenisset segetum etiam provenisset negotium integre textum tempore copia sine viri sine negotium dedit regeret indolis dedit destinatis dedit destinatis provenisset Romano sine actitatum negotium sine iam provenisset sine Africam iam praeclarae copia cum Africam viri actitatum frumentum tempore victus Romano pauloque sine textum pro Africam praeclarae est actitatum copia restituit negotium esse indolis iam copia cum regeret novimus consule horreis frumentum indolis cum postea cuius lassatis cum indoli copia lassatis cum novimus mora ex praeclarae iam pro horreis Romano ex regeret indolis etiam.</center></html> +coser.ui.home.text=<html><center>CoSeR Le logiciel Coser est con\u00E7u par l'Ifremer (projet Syst\u00E8me d'informations halieutiques) comme l'un des maillons d'une cha\u00EEne de traitement des donn\u00E9es des campagnes halieutiques pour calculer des indicateurs \u00E9cosyst\u00E9miques. Il se situe \u00E0 l'interface entre les donn\u00E9es extraites des bases de donn\u00E9es source des campagnes et le logiciel de calcul R-Sufi. Il remplit trois fonctions \: contr\u00F4le de qualit\u00E9 des donn\u00E9es, s\u00E9lection de jeux de donn\u00E9es coh\u00E9rents en r\u00E9f\u00E9rence aux objectifs de calcul et gestion de la m\u00E9ta-information relative aux traitements r\u00E9alis\u00E9s. Coser a \u00E9t\u00E9 cr\u00E9\u00E9 par Code Lutin avec des logiciels libres dans le cadre d'une convention Ifremer-MEEDDM 2010.</center></html> coser.ui.locale.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification. coser.ui.locale.title=Modification de la langue +coser.ui.mainframe.menu.admin=Administration +coser.ui.mainframe.menu.admin.publishResult=Publication des r\u00E9sultats coser.ui.mainframe.menu.closeProject=Fermer le projet coser.ui.mainframe.menu.configuration=Configuration coser.ui.mainframe.menu.data=Donn\u00E9es @@ -84,7 +86,6 @@ coser.ui.mainframe.menu.openProject=Ouvrir un projet coser.ui.mainframe.menu.options=Options coser.ui.mainframe.menu.quit=Quitter -coser.ui.mainframe.menu.uploadResult=Publication des r\u00E9sultats coser.ui.mainframe.menu.validators=Contr\u00F4les coser.ui.mainframe.menu.view=Vue coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me

1 0