Author: fdesbois Date: 2010-10-03 14:15:34 +0000 (Sun, 03 Oct 2010) New Revision: 647 Log: - Migrate nuiton libraries (EUGene, Nuiton-utils and ToPIA) - Fix some javadoc Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-09-29 08:13:10 UTC (rev 646) +++ trunk/changelog.txt 2010-10-03 14:15:34 UTC (rev 647) @@ -3,6 +3,20 @@ Historique des versions +1.5.3 +----- + +Anomalies ++++++++++ + +Mise à jour librairies +++++++++++++++++++++++ + +- **Nuiton-utils** 1.3.1 -> 1.4.2 [http://maven-site.nuiton.org/nuiton-utils] +- **ToPIA** 2.4.2 -> 2.4.3 [http://maven-site.nuiton.org/topia/topia-persistence] +- **EUGene** 2.1.1 -> 2.2 [http://maven-site.nuiton.org/eugene] +- **mavenpom4labs** 2.2.3 -> 2.2.6 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + 1.5.2 ----- @@ -12,6 +26,11 @@ - [fdesbois] Ano #2374 : L'expéditeur lors de l'envoi du mail automatique d'un contact avec embarquement programmé/réalisé n'est pas bon. +Mise à jour librairies +++++++++++++++++++++++ + +- **mavenpom4labs** 2.2.2.1 -> 2.2.3 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + 1.5.1 ----- @@ -21,7 +40,6 @@ - [fdesbois] Evo #2370 : Cartographie contacts : modifier taille du camembert en fonction du nombre de contacts. - [fdesbois] Evo #2369 : Ajout filtres sur carte des contacts. -- [fdesbois] Evo #2361 : Mail automatique suite à un embarquement programmé. Anomalies +++++++++ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:13:10 UTC (rev 646) +++ trunk/pom.xml 2010-10-03 14:15:34 UTC (rev 647) @@ -286,10 +286,10 @@ <!-- libraries version --> <i18n.version>1.2.2</i18n.version> - <nuitonutils.version>1.3.1</nuitonutils.version> + <nuitonutils.version>1.4.2</nuitonutils.version> <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.4.2</topia.version> - <eugene.version>2.1.1</eugene.version> + <topia.version>2.4.3</topia.version> + <eugene.version>2.2</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> </properties> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-09-29 08:13:10 UTC (rev 646) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-10-03 14:15:34 UTC (rev 647) @@ -53,7 +53,6 @@ import org.slf4j.LoggerFactory; import java.nio.charset.Charset; -import java.security.NoSuchAlgorithmException; import java.util.Date; import java.util.Locale; @@ -343,10 +342,13 @@ } @Override - public void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws WaoException { + public void treateError(TopiaContext transaction, + Exception eee, + String message, + Object... args) throws WaoException { + if (log.isDebugEnabled()) { - log.debug(_(message, args),eee); + log.debug(_(message, args), eee); } if (!(eee instanceof WaoException)) { //if (!(eee instanceof TopiaException)) { @@ -395,12 +397,12 @@ @Override public String encodeString(String string) { - try { +// try { return StringUtil.encodeMD5(string); - } catch (NoSuchAlgorithmException eee) { - treateError(eee, n_("wao.error.context.encodeString")); - } - return null; +// } catch (NoSuchAlgorithmException eee) { +// treateError(eee, n_("wao.error.context.encodeString")); +// } +// return null; } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-09-29 08:13:10 UTC (rev 646) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-10-03 14:15:34 UTC (rev 647) @@ -293,16 +293,24 @@ * @param source which contains data to save * @param destination receiver to save (will be null for a creation) * @param calculateReal for sampleMonth update - * @throws TopiaException - * @throws NullSampleMonthException + * @throws TopiaException for any Topia technical trouble + * @throws NullSampleMonthException if sampleMonth not found to update tides + * value * @see #updateSampleMonthTidesValue(TopiaContext, Contact, Contact, boolean) */ - protected void createOrUpdateContact(ContactDAO dao, Contact source, - Contact destination, boolean calculateReal) - throws TopiaException, NullSampleMonthException { + protected void createOrUpdateContact(ContactDAO dao, + Contact source, + Contact destination, + boolean calculateReal) + throws TopiaException, + NullSampleMonthException { - updateSampleMonthTidesValue(dao.getContext(), destination, - source, calculateReal); + updateSampleMonthTidesValue( + dao.getContext(), + destination, + source, + calculateReal + ); // Create the contact if not defined if (destination == null) { @@ -310,12 +318,13 @@ log.debug("Create a new contact on " + source.getTopiaCreateDate()); } + destination = dao.create( Contact.BOAT, source.getBoat(), Contact.SAMPLE_ROW, source.getSampleRow(), // FIXME-FD20100415 : don't use the topiaCreateDate as a business field - TopiaEntity.TOPIA_CREATE_DATE, - source.getTopiaCreateDate()); + TopiaEntity.TOPIA_CREATE_DATE, source.getTopiaCreateDate() + ); if (log.isDebugEnabled()) { log.debug("TopiaId of the new contact : " + @@ -527,9 +536,12 @@ @Override public ImportResults executeImportContactCsv(TopiaContext transaction, - ConnectedUser user, InputStream input) - throws TopiaException, IOException, - WaoBusinessException, ParseException { + ConnectedUser user, + InputStream input) + throws TopiaException, + IOException, + WaoBusinessException, + ParseException { ImportResults result = new ImportResultsImpl(); int currRow = 1; @@ -742,7 +754,7 @@ * @param oldContact old state of the contact * @param contact changed can be null for delete case * @param calculateReal to calculate real tides value - * @throws TopiaException + * @throws TopiaException for any Topia technical trouble * @throws NullSampleMonthException if SampleMonth can't be found */ protected void updateSampleMonthTidesValue( @@ -856,7 +868,7 @@ * * @param transaction used to update the ElligibleBoat * @param contact which contains sampleRow and boat to link - * @throws TopiaException + * @throws TopiaException for any Topia technical trouble */ protected void updateElligibleBoatForContact(TopiaContext transaction, Contact contact) throws TopiaException {