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

r1673 - trunk/tutti-ui-swing/src/main/assembly/full
by tchemit＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: tchemit Date: 2014-03-31 09:39:41 +0200 (Mon, 31 Mar 2014) New Revision: 1673 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1673 Log: fix help link Modified: trunk/tutti-ui-swing/src/main/assembly/full/README.txt Modified: trunk/tutti-ui-swing/src/main/assembly/full/README.txt =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/README.txt 2014-03-31 07:39:01 UTC (rev 1672) +++ trunk/tutti-ui-swing/src/main/assembly/full/README.txt 2014-03-31 07:39:41 UTC (rev 1673) @@ -27,4 +27,4 @@ L'aide en ligne est consultable dans l'application ou bien sur le site -http://maven-site.forge.codelutin.com/tutti/help/fr/index.html \ No newline at end of file +http://doc.codelutin.com/tutti/help/fr/index.html

1 0

r1672 - in trunk/tutti-ui-swing/src/main/assembly: . full full/ichtyometre
by tchemit＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: tchemit Date: 2014-03-31 09:39:01 +0200 (Mon, 31 Mar 2014) New Revision: 1672 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1672 Log: fixes #4864: Int?\195?\169grer le firmware 1.58 de l'ichtyom?\195?\168tre Added: trunk/tutti-ui-swing/src/main/assembly/full/ichtyometre/ trunk/tutti-ui-swing/src/main/assembly/full/ichtyometre/10MF1_Firmware_v1-58.eeprom Removed: trunk/tutti-ui-swing/src/main/assembly/full/ichtyometre/10MF1_Firmware_v1-57.eeprom trunk/tutti-ui-swing/src/main/assembly/full/ichyometre/ Modified: trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml Deleted: trunk/tutti-ui-swing/src/main/assembly/full/ichtyometre/10MF1_Firmware_v1-57.eeprom =================================================================== (Binary files differ) Copied: trunk/tutti-ui-swing/src/main/assembly/full/ichtyometre/10MF1_Firmware_v1-58.eeprom (from rev 1669, trunk/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-58.eeprom) =================================================================== (Binary files differ) Modified: trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2014-03-31 07:38:14 UTC (rev 1671) +++ trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2014-03-31 07:39:01 UTC (rev 1672) @@ -40,7 +40,7 @@ <include>*.bat</include> <include>README*</include> <include>report/**</include> - <include>ichyometre/**</include> + <include>ichtyometre/**</include> </includes> </fileSet>

1 0

r1671 - in tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly: . full full/ichtyometre
by tchemit＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: tchemit Date: 2014-03-31 09:38:14 +0200 (Mon, 31 Mar 2014) New Revision: 1671 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1671 Log: fixes #4864: Int?\195?\169grer le firmware 1.58 de l'ichtyom?\195?\168tre Added: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichtyometre/ tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichtyometre/10MF1_Firmware_v1-58.eeprom Removed: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichtyometre/10MF1_Firmware_v1-57.eeprom tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichyometre/ Modified: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/tutti-full-component.xml Deleted: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichtyometre/10MF1_Firmware_v1-57.eeprom =================================================================== (Binary files differ) Copied: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichtyometre/10MF1_Firmware_v1-58.eeprom (from rev 1670, tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-58.eeprom) =================================================================== (Binary files differ) Modified: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/tutti-full-component.xml =================================================================== --- tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2014-03-31 07:36:49 UTC (rev 1670) +++ tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2014-03-31 07:38:14 UTC (rev 1671) @@ -40,7 +40,7 @@ <include>*.bat</include> <include>README*</include> <include>report/**</include> - <include>ichyometre/**</include> + <include>ichtyometre/**</include> </includes> </fileSet>

1 0

r1670 - tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichyometre
by tchemit＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: tchemit Date: 2014-03-31 09:36:49 +0200 (Mon, 31 Mar 2014) New Revision: 1670 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1670 Log: fixes #4864: Int?\195?\169grer le firmware 1.58 de l'ichtyom?\195?\168tre Added: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-58.eeprom Removed: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-57.eeprom Deleted: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-57.eeprom =================================================================== (Binary files differ) Added: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-58.eeprom =================================================================== (Binary files differ) Property changes on: tags/tutti-3.2.3/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-58.eeprom ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r1669 - trunk/tutti-ui-swing/src/main/assembly/full/ichyometre
by tchemit＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: tchemit Date: 2014-03-31 09:34:39 +0200 (Mon, 31 Mar 2014) New Revision: 1669 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1669 Log: fixes #4864: Int?\195?\169grer le firmware 1.58 de l'ichtyom?\195?\168tre Added: trunk/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-58.eeprom Removed: trunk/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-57.eeprom Deleted: trunk/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-57.eeprom =================================================================== (Binary files differ) Added: trunk/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-58.eeprom =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/assembly/full/ichyometre/10MF1_Firmware_v1-58.eeprom ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r1668 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: maven-release Date: 2014-03-31 09:16:30 +0200 (Mon, 31 Mar 2014) New Revision: 1668 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1668 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-03-31 07:16:24 UTC (rev 1667) +++ trunk/pom.xml 2014-03-31 07:16:30 UTC (rev 1668) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.3</version> + <version>4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.2.3 + https://forge.codelutin.com/projects/tutti/repository/trunk </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.2.3 + scm:svn:http://svn.codelutin.com/tutti/trunk </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.2.3 + scm:svn:https://svn.codelutin.com/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-03-31 07:16:24 UTC (rev 1667) +++ trunk/tutti-ichtyometer/pom.xml 2014-03-31 07:16:30 UTC (rev 1668) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.3</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-03-31 07:16:24 UTC (rev 1667) +++ trunk/tutti-persistence/pom.xml 2014-03-31 07:16:30 UTC (rev 1668) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.3</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-03-31 07:16:24 UTC (rev 1667) +++ trunk/tutti-service/pom.xml 2014-03-31 07:16:30 UTC (rev 1668) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.3</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-03-31 07:16:24 UTC (rev 1667) +++ trunk/tutti-ui-swing/pom.xml 2014-03-31 07:16:30 UTC (rev 1668) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.3</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1667 - tags
by maven-release＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: maven-release Date: 2014-03-31 09:16:24 +0200 (Mon, 31 Mar 2014) New Revision: 1667 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1667 Log: [maven-release-plugin] copy for tag tutti-3.2.3 Added: tags/tutti-3.2.3/

1 0

r1666 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: maven-release Date: 2014-03-31 09:16:16 +0200 (Mon, 31 Mar 2014) New Revision: 1666 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1666 Log: [maven-release-plugin] prepare release tutti-3.2.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-03-28 16:26:34 UTC (rev 1665) +++ trunk/pom.xml 2014-03-31 07:16:16 UTC (rev 1666) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.2.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.2.3 </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/trunk + scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.2.3 </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/trunk + scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.2.3 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-03-28 16:26:34 UTC (rev 1665) +++ trunk/tutti-ichtyometer/pom.xml 2014-03-31 07:16:16 UTC (rev 1666) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.2.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-03-28 16:26:34 UTC (rev 1665) +++ trunk/tutti-persistence/pom.xml 2014-03-31 07:16:16 UTC (rev 1666) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.2.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-03-28 16:26:34 UTC (rev 1665) +++ trunk/tutti-service/pom.xml 2014-03-31 07:16:16 UTC (rev 1666) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.2.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-03-28 16:26:34 UTC (rev 1665) +++ trunk/tutti-ui-swing/pom.xml 2014-03-31 07:16:16 UTC (rev 1666) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-SNAPSHOT</version> + <version>3.2.3</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1665 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence
by tchemit＠users.forge.codelutin.com 28 Mar '14

28 Mar '14

Author: tchemit Date: 2014-03-28 17:26:34 +0100 (Fri, 28 Mar 2014) New Revision: 1665 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1665 Log: fixes #4855: [EXPORT] sumatra V2 : probl?\195?\168me calcul longueurs moyennes Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-03-28 16:26:18 UTC (rev 1664) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-03-28 16:26:34 UTC (rev 1665) @@ -33,7 +33,6 @@ import fr.ifremer.adagio.core.dao.technical.VersionNotFoundException; import fr.ifremer.adagio.core.service.technical.CacheService; import fr.ifremer.adagio.core.service.technical.sanity.DatabaseSanityService; -import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; @@ -79,6 +78,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -789,12 +789,24 @@ Multimap<Species, SpeciesBatchFrequency> result = ArrayListMultimap.create(); for (SpeciesBatch speciesBatch : batchContainer.getChildren()) { - List<SpeciesBatchFrequency> speciesBatchFrequency = getAllSpeciesBatchFrequency(speciesBatch.getId()); - result.putAll(speciesBatch.getSpecies(), speciesBatchFrequency); + getAllSpeciesBatchFrequencyForBatch(speciesBatch, result); } return result; } + protected void getAllSpeciesBatchFrequencyForBatch(SpeciesBatch batch, + Multimap<Species, SpeciesBatchFrequency> result) { + + List<SpeciesBatchFrequency> speciesBatchFrequency = getAllSpeciesBatchFrequency(batch.getId()); + result.putAll(batch.getSpecies(), speciesBatchFrequency); + + if (!batch.isChildBatchsEmpty()) { + for (SpeciesBatch child : batch.getChildBatchs()) { + getAllSpeciesBatchFrequencyForBatch(child, result); + } + } + } + @Override public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies) { return speciesBatchService.saveSpeciesBatchFrequency(speciesBatchId, frequencies); @@ -843,13 +855,26 @@ public Multimap<Species, BenthosBatchFrequency> getAllBenthosBatchFrequencyForBatch(BatchContainer<BenthosBatch> batchContainer) { Multimap<Species, BenthosBatchFrequency> result = ArrayListMultimap.create(); + for (BenthosBatch speciesBatch : batchContainer.getChildren()) { - List<BenthosBatchFrequency> speciesBatchFrequency = getAllBenthosBatchFrequency(speciesBatch.getId()); - result.putAll(speciesBatch.getSpecies(), speciesBatchFrequency); + getAllBenthosBatchFrequencyForBatch(speciesBatch, result); } return result; } + protected void getAllBenthosBatchFrequencyForBatch(BenthosBatch batch, + Multimap<Species, BenthosBatchFrequency> result) { + + List<BenthosBatchFrequency> speciesBatchFrequency = getAllBenthosBatchFrequency(batch.getId()); + result.putAll(batch.getSpecies(), speciesBatchFrequency); + + if (!batch.isChildBatchsEmpty()) { + for (BenthosBatch child : batch.getChildBatchs()) { + getAllBenthosBatchFrequencyForBatch(child, result); + } + } + } + @Override public List<BenthosBatchFrequency> saveBenthosBatchFrequency(String benthosBatchId, List<BenthosBatchFrequency> frequencies) {

1 0

r1664 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action
by tchemit＠users.forge.codelutin.com 28 Mar '14

28 Mar '14

Author: tchemit Date: 2014-03-28 17:26:18 +0100 (Fri, 28 Mar 2014) New Revision: 1664 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1664 Log: fixes #4857: [EXPORT] Bien v?\195?\169rifi?\195?\169 qu'un protocol est pr?\195?\169senttutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraV2Action.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraV2Action.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraV2Action.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraV2Action.java 2014-03-28 16:25:57 UTC (rev 1663) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraV2Action.java 2014-03-28 16:26:18 UTC (rev 1664) @@ -63,6 +63,17 @@ if (doAction) { + if (!getDataContext().isProtocolFilled()) { + displayWarningMessage( + t("tutti.exportCruiseForSumatraV2.title.required.protocol"), + t("tutti.exportCruiseForSumatraV2.message.required.protocol") + ); + doAction = false; + } + } + + if (doAction) { + String date = DateUtil.formatDate(new Date(), "dd-MM-yyyy"); // choose file to export file = saveFile(

1 0