- Tutti-commits - mailman.cloud.codelutin.com

r1699 - tags
by maven-release＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: maven-release Date: 2014-04-17 18:15:44 +0200 (Thu, 17 Apr 2014) New Revision: 1699 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1699 Log: [maven-release-plugin] copy for tag tutti-3.3.4 Added: tags/tutti-3.3.4/

1 0

r1698 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: maven-release Date: 2014-04-17 18:15:36 +0200 (Thu, 17 Apr 2014) New Revision: 1698 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1698 Log: [maven-release-plugin] prepare release tutti-3.3.4 Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-17 16:09:21 UTC (rev 1697) +++ trunk/pom.xml 2014-04-17 16:15:36 UTC (rev 1698) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.3.4</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/trunk + https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.4 </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/trunk + scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.4 </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/trunk + scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.4 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-04-17 16:09:21 UTC (rev 1697) +++ trunk/tutti-ichtyometer/pom.xml 2014-04-17 16:15:36 UTC (rev 1698) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.3.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-04-17 16:09:21 UTC (rev 1697) +++ trunk/tutti-persistence/pom.xml 2014-04-17 16:15:36 UTC (rev 1698) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.3.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-04-17 16:09:21 UTC (rev 1697) +++ trunk/tutti-service/pom.xml 2014-04-17 16:15:36 UTC (rev 1698) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.3.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-04-17 16:09:21 UTC (rev 1697) +++ trunk/tutti-ui-swing/pom.xml 2014-04-17 16:15:36 UTC (rev 1698) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.3.4</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1697 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities
by tchemit＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: tchemit Date: 2014-04-17 18:09:21 +0200 (Thu, 17 Apr 2014) New Revision: 1697 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1697 Log: fixes #4962 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-04-17 10:58:08 UTC (rev 1696) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-04-17 16:09:21 UTC (rev 1697) @@ -514,7 +514,12 @@ */ public static float roundKiloGram(float value) { BigDecimal sumB = new BigDecimal(value); - float result = sumB.abs(MATH_CONTEXT_4_DIGIT).floatValue(); + float result; + if (Math.abs(value - sumB.floatValue())< 0.0001f) { + result = value; + } else { + result = sumB.abs(MATH_CONTEXT_4_DIGIT).floatValue(); + } return result; }

1 0

[ANN] - Tutti 3.3.3 released
by codelutin.com Release Notification 17 Apr '14

17 Apr '14

The Tutti team is pleased to announce the tutti-3.3.3 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://doc.codelutin.com/projects/tutti Changes ------- Changes in this version include: Fixed Bugs: o [EXPORT GENERIQUE] Probleme de mise à jour des noms de colonnes Issue: 4945. Thanks to Anne-Sophie Cornou. Resolved by tchemit. o [CAPTURE] précison au gramme partout Issue: 4953. Thanks to Vincent BADTS. Resolved by tchemit. Changes: o updates mavenpom to 5.0.6 Issue: 4956. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.3.3-tools.zip - http://forge.codelutin.com/attachments/download/1730 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1696 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: maven-release Date: 2014-04-17 12:58:08 +0200 (Thu, 17 Apr 2014) New Revision: 1696 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1696 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-17 10:58:01 UTC (rev 1695) +++ trunk/pom.xml 2014-04-17 10:58:08 UTC (rev 1696) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.3</version> + <version>3.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.3 + https://forge.codelutin.com/projects/tutti/repository/trunk </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.3 + scm:svn:http://svn.codelutin.com/tutti/trunk </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.3 + scm:svn:https://svn.codelutin.com/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-04-17 10:58:01 UTC (rev 1695) +++ trunk/tutti-ichtyometer/pom.xml 2014-04-17 10:58:08 UTC (rev 1696) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.3</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-04-17 10:58:01 UTC (rev 1695) +++ trunk/tutti-persistence/pom.xml 2014-04-17 10:58:08 UTC (rev 1696) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.3</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-04-17 10:58:01 UTC (rev 1695) +++ trunk/tutti-service/pom.xml 2014-04-17 10:58:08 UTC (rev 1696) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.3</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-04-17 10:58:01 UTC (rev 1695) +++ trunk/tutti-ui-swing/pom.xml 2014-04-17 10:58:08 UTC (rev 1696) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.3</version> + <version>3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1695 - tags
by maven-release＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: maven-release Date: 2014-04-17 12:58:01 +0200 (Thu, 17 Apr 2014) New Revision: 1695 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1695 Log: [maven-release-plugin] copy for tag tutti-3.3.3 Added: tags/tutti-3.3.3/

1 0

r1694 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: maven-release Date: 2014-04-17 12:57:53 +0200 (Thu, 17 Apr 2014) New Revision: 1694 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1694 Log: [maven-release-plugin] prepare release tutti-3.3.3 Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/trunk + https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.3 </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/trunk + scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.3 </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/trunk + scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.3 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/tutti-ichtyometer/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/tutti-persistence/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/tutti-service/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) +++ trunk/tutti-ui-swing/pom.xml 2014-04-17 10:57:53 UTC (rev 1694) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1693 - trunk
by tchemit＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: tchemit Date: 2014-04-17 12:52:20 +0200 (Thu, 17 Apr 2014) New Revision: 1693 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1693 Log: fixes #4956 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-17 10:48:02 UTC (rev 1692) +++ trunk/pom.xml 2014-04-17 10:52:20 UTC (rev 1693) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.4</version> + <version>5.0.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1692 - in trunk/tutti-service/src/main/java/fr/ifremer/tutti/service: export/generic protocol
by tchemit＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: tchemit Date: 2014-04-17 12:48:02 +0200 (Thu, 17 Apr 2014) New Revision: 1692 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1692 Log: fixes #4945 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-04-17 10:31:12 UTC (rev 1691) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-04-17 10:48:02 UTC (rev 1692) @@ -93,18 +93,12 @@ protected WeightComputingService weightComputingService; - protected char csvSeparator; - protected Caracteristic verticalOpeningCaracteristic; protected Caracteristic horizontalOpeningWingCaracteristic; protected Caracteristic horizontalOpeningDoorCaracteristic; - protected TuttiLocation country; - - protected SampleCategoryModel sampleCategoryModel; - protected Caracteristic deadOrAliveCaracteristic; protected Caracteristic genderCaracteristic; @@ -120,9 +114,6 @@ decoratorService = getService(DecoratorService.class); weightComputingService = getService(WeightComputingService.class); - sampleCategoryModel = context.getSampleCategoryModel(); - - csvSeparator = context.getConfig().getCsvSeparator(); verticalOpeningCaracteristic = persistenceService.getVerticalOpeningCaracteristic(); horizontalOpeningWingCaracteristic = persistenceService.getHorizontalOpeningWingCaracteristic(); horizontalOpeningDoorCaracteristic = persistenceService.getHorizontalOpeningDoorCaracteristic(); @@ -130,10 +121,6 @@ pmfmIdCaracteristic = persistenceService.getPmfmIdCaracteristic(); deadOrAliveCaracteristic = persistenceService.getDeadOrAliveCaracteristic(); genderCaracteristic = persistenceService.getSexCaracteristic(); - - List<TuttiLocation> allCountry = persistenceService.getAllCountry(); - String countryId = context.getConfig().getExportCountryId(); - country = TuttiEntities.splitById(allCountry).get(countryId); } public void exportProgram(String programId, @@ -302,6 +289,8 @@ List<Species> allReferentSpecies = persistenceService.getAllReferentSpecies(); Map<String, Species> speciesById = TuttiEntities.splitById(allReferentSpecies); + char csvSeparator = context.getConfig().getCsvSeparator(); + return new ExportContext( basedir, csvSeparator, @@ -310,7 +299,7 @@ deadOrAliveCaracteristic, genderCaracteristic, pmfmIdCaracteristic, - sampleCategoryModel, + context.getSampleCategoryModel(), speciesById); } @@ -420,6 +409,11 @@ protected void exportSurvey(ExportContext exportContext, Cruise cruise) { + + List<TuttiLocation> allCountry = persistenceService.getAllCountry(); + String countryId = context.getConfig().getExportCountryId(); + TuttiLocation country = TuttiEntities.splitById(allCountry).get(countryId); + try { List<SurveyExportRow> rows = Lists.newArrayList(); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-04-17 10:31:12 UTC (rev 1691) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-04-17 10:48:02 UTC (rev 1692) @@ -32,8 +32,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; import com.google.common.io.Files; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -51,6 +49,7 @@ import org.nuiton.csv.Export; import org.nuiton.csv.Import; import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -76,15 +75,12 @@ private static final Log log = LogFactory.getLog(ProtocolImportExportService.class); - protected SampleCategoryModel sampleCategoryModel; - protected TuttiEnumerationFile enumerationFile; @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context); PersistenceService service = getService(PersistenceService.class); - sampleCategoryModel = context.getDataContext().getSampleCategoryModel(); enumerationFile = service.getEnumerationFile(); } @@ -141,19 +137,23 @@ protocol.setLengthClassesPmfmId( mergeIds(protocol.getLengthClassesPmfmId(), - ids.get(CaracteristicType.LENGTH_STEP))); + ids.get(CaracteristicType.LENGTH_STEP)) + ); protocol.setVesselUseFeaturePmfmId( mergeIds(protocol.getVesselUseFeaturePmfmId(), - ids.get(CaracteristicType.VESSEL_USE_FEATURE))); + ids.get(CaracteristicType.VESSEL_USE_FEATURE)) + ); protocol.setGearUseFeaturePmfmId( mergeIds(protocol.getGearUseFeaturePmfmId(), - ids.get(CaracteristicType.GEAR_USE_FEATURE))); + ids.get(CaracteristicType.GEAR_USE_FEATURE)) + ); protocol.setIndividualObservationPmfmId( mergeIds(protocol.getIndividualObservationPmfmId(), - ids.get(CaracteristicType.INDIVIDUAL_OBSERVATION))); + ids.get(CaracteristicType.INDIVIDUAL_OBSERVATION)) + ); }

1 0

r1691 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities
by tchemit＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: tchemit Date: 2014-04-17 12:31:12 +0200 (Thu, 17 Apr 2014) New Revision: 1691 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1691 Log: fixes #4953 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-04-15 08:14:48 UTC (rev 1690) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-04-17 10:31:12 UTC (rev 1691) @@ -414,7 +414,11 @@ private static final double EARTH_RADIUS = 6378288.0; - private static final MathContext MATH_CONTEXT_4_DIGIT = new MathContext(4); + /** + * Take a {@code 5} digit context beacuse of rounding stuff to + * get exactly 4 correct digits. + */ + private static final MathContext MATH_CONTEXT_4_DIGIT = new MathContext(5); private static DecimalFormatSymbols symbols;

1 0