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

r762 - trunk
by chatellier＠users.labs.libre-entreprise.org 24 Feb '11

24 Feb '11

Author: chatellier Date: 2011-02-24 16:27:10 +0000 (Thu, 24 Feb 2011) New Revision: 762 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-24 16:18:16 UTC (rev 761) +++ trunk/changelog.txt 2011-02-24 16:27:10 UTC (rev 762) @@ -1,6 +1,12 @@ Coser release notes =================== +1.0.3 +----- + + * Add control about surface attributes to be positive only + * Fix some translation + 1.0.2 -----

1 0

r761 - in trunk/coser-business/src/main: java/fr/ifremer/coser/validators resources/i18n resources/validators/fr/ifremer/coser/data
by chatellier＠users.labs.libre-entreprise.org 24 Feb '11

24 Feb '11

Author: chatellier Date: 2011-02-24 16:18:16 +0000 (Thu, 24 Feb 2011) New Revision: 761 Log: Add positive check on surface Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java 2011-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java 2011-02-24 16:18:16 UTC (rev 761) @@ -69,12 +69,12 @@ try { double doubleValue = Double.parseDouble(value); - + // only check for a minimum value if the min parameter is set if (min != null && doubleValue < min) { addFieldError(getFieldName(), object); } - + // only check for a maximum value if the max parameter is set if (max != null && doubleValue > max) { addFieldError(getFieldName(), object); 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-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-02-24 16:18:16 UTC (rev 761) @@ -156,7 +156,9 @@ month\ is\ not\ valid\ (2\ digits)= number\ attribute\ is\ not\ a\ valid\ double= surface\ attribute\ is\ not\ a\ valid\ double= +surface\ attribute\ must\ be\ positive= sweptSurface\ attribute\ is\ not\ a\ valid\ double= +sweptSurface\ attribute\ must\ be\ positive= sweptSurface\ must\ contain\ at\ least\ 3\ decimals= weight\ attribute\ is\ not\ a\ valid\ double= year\ is\ not\ valid\ (4\ digits.2\ digits)= 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-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-02-24 16:18:16 UTC (rev 761) @@ -156,7 +156,9 @@ month\ is\ not\ valid\ (2\ digits)=L'attribut Mois n'est pas valide (2 chiffres) number\ attribute\ is\ not\ a\ valid\ double=L'attribut Nombre n'est pas un r\u00E9el valide surface\ attribute\ is\ not\ a\ valid\ double=L'attribut Surface n'est pas un r\u00E9el valide +surface\ attribute\ must\ be\ positive=L'attribut Surface n'est pas positif sweptSurface\ attribute\ is\ not\ a\ valid\ double=L'attribut SurfaceBalayee n'est pas un r\u00E9el valide +sweptSurface\ attribute\ must\ be\ positive=L'attribut SurfaceBalayee n'est pas positif sweptSurface\ must\ contain\ at\ least\ 3\ decimals=L'attribut SurfaceBalayee doit contenir au moins 3 decimales weight\ attribute\ is\ not\ a\ valid\ double=L'attribut Poids n'est pas un r\u00E9el valide year\ is\ not\ valid\ (4\ digits.2\ digits)=L'attribut Ann\u00E9e n'est pas valide (4 chiffres.2 chiffres) Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml 2011-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml 2011-02-24 16:18:16 UTC (rev 761) @@ -65,7 +65,17 @@ <param name="notAvailable">NA</param> <message>sweptSurface attribute is not a valid double</message> </field-validator> + <field-validator type="coserDouble"> + <param name="min">0</param> + <message>sweptSurface attribute must be positive</message> + </field-validator> </field> + <field name="sweptSurface"> + <field-validator type="coserDouble"> + <param name="min">0</param> + <message>sweptSurface attribute must be positive</message> + </field-validator> + </field> <field name="latAsString"> <field-validator type="checkDouble"> <param name="notAvailable">NA</param> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml 2011-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml 2011-02-24 16:18:16 UTC (rev 761) @@ -44,4 +44,10 @@ <message>surface attribute is not a valid double</message> </field-validator> </field> + <field name="surface"> + <field-validator type="coserDouble"> + <param name="min">0</param> + <message>surface attribute must be positive</message> + </field-validator> + </field> </validators> \ No newline at end of file

1 0

r760 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 23 Feb '11

23 Feb '11

Author: chatellier Date: 2011-02-23 09:30:33 +0000 (Wed, 23 Feb 2011) New Revision: 760 Log: Change home view description text Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 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-02-22 13:19:55 UTC (rev 759) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-02-23 09:30:33 UTC (rev 760) @@ -64,7 +64,7 @@ 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=<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.home.text=<html><center>CoSeR The Coser software has been created by Ifremer (Fisheries Information System) as a tool for the treatment of the groundfish survey data, to calculate population and ecosystem indices. It is to be used after extracting data from databases and prior to the software RSUFI. It has three functions\: data quality control, selection of a coherent dataset, and management of the meta-information relative to the treatments that have been done. Coser have been developed by Code Lutin using freeware under the Ifremer-MEEDDM 2010 convention n\u00B07414.</center></html> coser.ui.locale.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification.\nYou must restart application to take effect. coser.ui.locale.title=Locale modification coser.ui.mainframe.menu.about=About Coser

1 0

r759 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 22 Feb '11

22 Feb '11

Author: chatellier Date: 2011-02-22 13:19:55 +0000 (Tue, 22 Feb 2011) New Revision: 759 Log: Fix i18n Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 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-02-22 13:18:33 UTC (rev 758) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-02-22 13:19:55 UTC (rev 759) @@ -138,7 +138,7 @@ coser.ui.result.editResult=Modify result coser.ui.result.estComIndFile=ESTCOMind file \: coser.ui.result.estPopIndFile=ESTPOPind file \: -coser.ui.result.extractDataButton=Export as Rsufi format +coser.ui.result.extractDataButton=Export in Rsufi format coser.ui.result.extractDataLabel=Export directory \: coser.ui.result.extractDataTitle=Export RSufi input data coser.ui.result.mapsDirectory=Maps directory \:

1 0

r758 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 22 Feb '11

22 Feb '11

Author: chatellier Date: 2011-02-22 13:18:33 +0000 (Tue, 22 Feb 2011) New Revision: 758 Log: Fix i18n Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-02-22 13:11:22 UTC (rev 757) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-02-22 13:18:33 UTC (rev 758) @@ -214,7 +214,7 @@ if (frHeaders != null) { if (!Arrays.equals(line, enHeaders) && !Arrays.equals(line, frHeaders)) { - throw new CoserBusinessException(_("Wrong header detected in file %s. Find : %s, expected %s or %s", + throw new CoserBusinessException(_("Wrong header detected in file %s. Found : %s, expected %s or %s", file.getName(), StringUtils.join(line, ", "), StringUtils.join(frHeaders, ", "), @@ -223,7 +223,7 @@ } else { if (!Arrays.equals(line, enHeaders)) { - throw new CoserBusinessException(_("Wrong header detected in file %s. Find : %s, expected %s", + throw new CoserBusinessException(_("Wrong header detected in file %s. Found : %s, expected %s", file.getName(), StringUtils.join(line, ", "), StringUtils.join(enHeaders, ", "))); 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-02-22 13:11:22 UTC (rev 757) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-02-22 13:18:33 UTC (rev 758) @@ -16,8 +16,8 @@ Project\ %s\ doesn't\ exists\ \!= Selection\ %s\ already\ exists= Species\ %s\ doesn't\ exist\ in\ referential= -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= +Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s +Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s\nor\n\t%s age\ attribute\ is\ not\ a\ valid\ double= coser.business.category.catch=Catch coser.business.category.haul=Haul 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-02-22 13:11:22 UTC (rev 757) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-02-22 13:18:33 UTC (rev 758) @@ -16,8 +16,8 @@ Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \! Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \! Species\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. -Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. +Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. +Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. age\ attribute\ is\ not\ a\ valid\ double=L'attribut Age n'est pas un r\u00E9el valide coser.business.category.catch=Captures coser.business.category.haul=Traits 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-02-22 13:11:22 UTC (rev 757) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-02-22 13:18:33 UTC (rev 758) @@ -58,8 +58,8 @@ coser.ui.control.validcontroltip=Mark control as validated. Can be done only after data check ended without errors. coser.ui.error.htmlReportCantBeOpened=HTML report as been generated in \:\n%s\nbut it can't be opened because default system browser in undefined \! coser.ui.error.htmlReportError=Open error -coser.ui.error.htmlmessage=An error occurs \: %s -coser.ui.error.reportSendTo=A repport has been sent to %s +coser.ui.error.htmlmessage=An error occurred \: %s +coser.ui.error.reportSendTo=A report has been sent to %s coser.ui.error.title=Global application error 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)

1 0

r757 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 22 Feb '11

22 Feb '11

Author: chatellier Date: 2011-02-22 13:11:22 +0000 (Tue, 22 Feb 2011) New Revision: 757 Log: Affichage du message de redemarage dans les 2 langues Modified: 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/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-02-18 16:05:42 UTC (rev 756) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-02-22 13:11:22 UTC (rev 757) @@ -65,7 +65,7 @@ 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=<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.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification.\nYou must restart application to take effect. coser.ui.locale.title=Locale modification coser.ui.mainframe.menu.about=About Coser coser.ui.mainframe.menu.admin=Admin 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-02-18 16:05:42 UTC (rev 756) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-02-22 13:11:22 UTC (rev 757) @@ -65,7 +65,7 @@ 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>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.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification.\nYou must restart application to take effect. coser.ui.locale.title=Modification de la langue coser.ui.mainframe.menu.about=\u00C0 propos de Coser coser.ui.mainframe.menu.admin=Administration

1 0

r756 - in trunk: . coser-business coser-ui coser-web
by chatellier＠users.labs.libre-entreprise.org 18 Feb '11

18 Feb '11

Author: chatellier Date: 2011-02-18 16:05:42 +0000 (Fri, 18 Feb 2011) New Revision: 756 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-02-18 16:05:40 UTC (rev 755) +++ trunk/coser-business/pom.xml 2011-02-18 16:05:42 UTC (rev 756) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-02-18 16:05:40 UTC (rev 755) +++ trunk/coser-ui/pom.xml 2011-02-18 16:05:42 UTC (rev 756) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-02-18 16:05:40 UTC (rev 755) +++ trunk/coser-web/pom.xml 2011-02-18 16:05:42 UTC (rev 756) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-18 16:05:40 UTC (rev 755) +++ trunk/pom.xml 2011-02-18 16:05:42 UTC (rev 756) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -326,9 +326,9 @@ </properties> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.2</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.2</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/coser-1.0.2?root=coser</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=coser</url> </scm> <build>

1 0

r755 - tags
by chatellier＠users.labs.libre-entreprise.org 18 Feb '11

18 Feb '11

Author: chatellier Date: 2011-02-18 16:05:40 +0000 (Fri, 18 Feb 2011) New Revision: 755 Log: [maven-release-plugin] copy for tag coser-1.0.2 Added: tags/coser-1.0.2/

1 0

r754 - in trunk: . coser-business coser-ui coser-web
by chatellier＠users.labs.libre-entreprise.org 18 Feb '11

18 Feb '11

Author: chatellier Date: 2011-02-18 16:05:37 +0000 (Fri, 18 Feb 2011) New Revision: 754 Log: [maven-release-plugin] prepare release coser-1.0.2 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-02-18 08:57:53 UTC (rev 753) +++ trunk/coser-business/pom.xml 2011-02-18 16:05:37 UTC (rev 754) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-02-18 08:57:53 UTC (rev 753) +++ trunk/coser-ui/pom.xml 2011-02-18 16:05:37 UTC (rev 754) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-02-18 08:57:53 UTC (rev 753) +++ trunk/coser-web/pom.xml 2011-02-18 16:05:37 UTC (rev 754) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-18 08:57:53 UTC (rev 753) +++ trunk/pom.xml 2011-02-18 16:05:37 UTC (rev 754) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> <packaging>pom</packaging> <modules> @@ -326,9 +326,9 @@ </properties> <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=coser</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.2</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/tags/coser-1.0.2</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/coser-1.0.2?root=coser</url> </scm> <build>

1 0

r753 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 18 Feb '11

18 Feb '11

Author: chatellier Date: 2011-02-18 08:57:53 +0000 (Fri, 18 Feb 2011) New Revision: 753 Log: Update sampling effort table after year / strata modification Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-02-18 08:57:25 UTC (rev 752) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-02-18 08:57:53 UTC (rev 753) @@ -76,7 +76,6 @@ import fr.ifremer.coser.ui.common.DataHandler; import fr.ifremer.coser.ui.control.ControlGraphFrame; import fr.ifremer.coser.ui.control.ControlHandler; -import fr.ifremer.coser.ui.control.ControlView; import fr.ifremer.coser.ui.result.SelectionAddResultDialog; import fr.ifremer.coser.ui.result.SelectionEditResultDialog; import fr.ifremer.coser.ui.selection.model.OccurrenceDensitySpeciesListModel; @@ -216,6 +215,9 @@ view.getFilteredSpeciesList().clearSelection(); view.getSelectedSpeciesListModel().setSpecies(new ArrayList<String>()); view.getSelectedSpeciesList().clearSelection(); + + // update sampling effort data table + showSamplingEffort(view); } /** @@ -256,6 +258,9 @@ detailView.setStrataValidated(!selectedStrata.isEmpty()); detailView.setSpeciesValidated(!selectedSpecies.isEmpty()); view.setEnabledAt(2, selection.isValidated()); // rsufi + + // update sampling effort data table + showSamplingEffort(detailView); } /** @@ -282,13 +287,13 @@ try { projectService.loadControlDataToSelection(project, selection); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.controldatareloaded"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); - // affiche les années initSelectionYears(view); view.getValidDatesButton().setEnabled(true); view.getDetailAccordionPane().setSelected(1); + + JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.controldatareloaded"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) { throw new CoserException("Can't reload control data", ex); @@ -355,9 +360,12 @@ updateSelectionYearsData(view); + // update sampling effort data table + showSamplingEffort(view); + JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.yearsvalidated"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); - + // auto select strata accordion pane view.getDetailAccordionPane().setSelected(2); } finally { @@ -380,9 +388,6 @@ OMToolSet toolSet = new OMToolSet(); toolSet.setupListeners(view.getStrataMap()); view.getStrataMapToolBar().add((Tool)toolSet); - - // default show sampling effort - showSamplingEffort(view); } /** @@ -430,6 +435,9 @@ updateSelectionStrataData(view); + // update sampling effort data table + showSamplingEffort(view); + JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.stratavalidated"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE);

1 0