Tutti-commits
Threads by month
- ----- 2026 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- 4058 discussions
r1802 - in branches/tutti-3.4.x: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com May 21, 2014
by maven-release＠users.forge.codelutin.com May 21, 2014
May 21, 2014
Author: maven-release
Date: 2014-05-21 10:30:30 +0200 (Wed, 21 May 2014)
New Revision: 1802
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1802
Log:
[maven-release-plugin] prepare release tutti-3.4.4
Modified:
branches/tutti-3.4.x/pom.xml
branches/tutti-3.4.x/tutti-ichtyometer/pom.xml
branches/tutti-3.4.x/tutti-persistence/pom.xml
branches/tutti-3.4.x/tutti-service/pom.xml
branches/tutti-3.4.x/tutti-ui-swing/pom.xml
Modified: branches/tutti-3.4.x/pom.xml
===================================================================
--- branches/tutti-3.4.x/pom.xml 2014-05-21 08:25:33 UTC (rev 1801)
+++ branches/tutti-3.4.x/pom.xml 2014-05-21 08:30:30 UTC (rev 1802)
@@ -32,7 +32,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.4-SNAPSHOT</version>
+ <version>3.4.4</version>
<packaging>pom</packaging>
<name>Tutti</name>
@@ -99,13 +99,13 @@
<scm>
<url>
- https://forge.codelutin.com/projects/tutti/repository/branches/tutti-3.4.x
+ https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.4.4
</url>
<connection>
- scm:svn:http://svn.codelutin.com/tutti/branches/tutti-3.4.x
+ scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.4.4
</connection>
<developerConnection>
- scm:svn:https://svn.codelutin.com/tutti/branches/tutti-3.4.x
+ scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.4.4
</developerConnection>
</scm>
<distributionManagement>
Modified: branches/tutti-3.4.x/tutti-ichtyometer/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/pom.xml 2014-05-21 08:25:33 UTC (rev 1801)
+++ branches/tutti-3.4.x/tutti-ichtyometer/pom.xml 2014-05-21 08:30:30 UTC (rev 1802)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.4-SNAPSHOT</version>
+ <version>3.4.4</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-persistence/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/pom.xml 2014-05-21 08:25:33 UTC (rev 1801)
+++ branches/tutti-3.4.x/tutti-persistence/pom.xml 2014-05-21 08:30:30 UTC (rev 1802)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.4-SNAPSHOT</version>
+ <version>3.4.4</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-service/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/pom.xml 2014-05-21 08:25:33 UTC (rev 1801)
+++ branches/tutti-3.4.x/tutti-service/pom.xml 2014-05-21 08:30:30 UTC (rev 1802)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.4-SNAPSHOT</version>
+ <version>3.4.4</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
Modified: branches/tutti-3.4.x/tutti-ui-swing/pom.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/pom.xml 2014-05-21 08:25:33 UTC (rev 1801)
+++ branches/tutti-3.4.x/tutti-ui-swing/pom.xml 2014-05-21 08:30:30 UTC (rev 1802)
@@ -27,7 +27,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>tutti</artifactId>
- <version>3.4.4-SNAPSHOT</version>
+ <version>3.4.4</version>
</parent>
<groupId>fr.ifremer.tutti</groupId>
1
0
May 21, 2014
Author: tchemit
Date: 2014-05-21 10:25:33 +0200 (Wed, 21 May 2014)
New Revision: 1801
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1801
Log:
clean license headers
Modified:
branches/tutti-3.4.x/pom.xml
branches/tutti-3.4.x/src/site/rst/dbversions.rst
branches/tutti-3.4.x/src/site/rst/features.rst
branches/tutti-3.4.x/src/site/rst/index.rst
branches/tutti-3.4.x/src/site/rst/mapping.rst
branches/tutti-3.4.x/src/site/rst/referential.rst
branches/tutti-3.4.x/src/site/site_fr.xml
branches/tutti-3.4.x/src/update/tutti-application.properties
branches/tutti-3.4.x/src/update/tutti-data.properties
branches/tutti-3.4.x/src/update/update-tutti.properties
branches/tutti-3.4.x/tutti-ichtyometer/src/main/assembly/log4j.properties
branches/tutti-3.4.x/tutti-ichtyometer/src/main/assembly/tools.xml
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java
branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java
branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java
branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java
branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java
branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java
branches/tutti-3.4.x/tutti-ichtyometer/src/test/resources/log4j.properties
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroResult.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/LabelAware.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationProvider.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceServiceImplementor.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/GearPhysicalFeaturesDaoImplTutti.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/GearPhysicalFeaturesDaoTutti.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntity.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntityBean.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEnumerable.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/BatchContainer.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModel.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelEntry.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocol1.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocolBean1.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocol1.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocolBean1.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrder.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrderBean.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MeasurementPersistenceHelper.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SamplePersistenceHelper.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/TuttiCatchBatchValidator.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiRunListener.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiRunner.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java
branches/tutti-3.4.x/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml
branches/tutti-3.4.x/tutti-persistence/src/main/resources/ehcache.xml
branches/tutti-3.4.x/tutti-persistence/src/main/resources/queries-override.hbm.xml
branches/tutti-3.4.x/tutti-persistence/src/main/resources/tutti-db-conf.properties
branches/tutti-3.4.x/tutti-persistence/src/main/resources/tutti-db-enumerations.properties
branches/tutti-3.4.x/tutti-persistence/src/main/resources/tuttiBeanRefFactory.xml
branches/tutti-3.4.x/tutti-persistence/src/main/xmi/tutti-persistence.properties
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFileTest.java
branches/tutti-3.4.x/tutti-persistence/src/test/resources/applicationContext-service-resources.xml
branches/tutti-3.4.x/tutti-persistence/src/test/resources/beanRefFactoryWitNoDb.xml
branches/tutti-3.4.x/tutti-persistence/src/test/resources/log4j.properties
branches/tutti-3.4.x/tutti-persistence/src/test/resources/tutti-test-read-dbEmpty.properties
branches/tutti-3.4.x/tutti-persistence/src/test/resources/tutti-test-read.properties
branches/tutti-3.4.x/tutti-persistence/src/test/server.properties
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/ClosedPersistenceService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/ValidationService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Directions.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialSynchronizeService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Cruise-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-warning-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-warning-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Program-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocol-error-validation.xml
branches/tutti-3.4.x/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl
branches/tutti-3.4.x/tutti-service/src/main/resources/validators.xml
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/BeanValidatorDetectorTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java
branches/tutti-3.4.x/tutti-service/src/test/resources/log4j.properties
branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css
branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js
branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js
branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties
branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties
branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbExport.properties
branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbMedits.properties
branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-linux-i586.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-linux-x64.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-windows-i586.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-windows-x64.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/help.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/i18n.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/standalone.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/tutti-full-component.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/filtered-resources/log4j.properties
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/css/style.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/config.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/dbManager.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editCruise.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editFishingOperation.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editProgram.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editProtocol.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editSampleCategory.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/faq.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/fonctionnalites_transversales.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/index.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/menu.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/navbar.js
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/report.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/selectCruise.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/config.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/dbManager.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/dbMapping.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editCruise.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editFishingOperation.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editProgram.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editProtocol.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editSampleCategory.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/faq.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/fonctionnalites_transversales.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/genericExport.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/index.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/menu.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/navbar.js
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/report.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/selectCruise.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/validation.html
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractChangeLocaleAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractChangeScreenAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractExportMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractImportMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractMainUITuttiAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddBenthosProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddSpeciesProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditCatchBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ChangeToLocaleFRAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ChangeToLocaleUKAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CleanBatchWeightsAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloneProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteFishingOperationAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditGearCaracteristicsAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProgramAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSampleCategoryModelAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedCruiseAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedCruiseCatchesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedProgramAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAllCaracteristicAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseValidationMessagesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportOperationValidationMessagesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolBenthosAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolCaracteristicAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolSpeciesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GoToPreviousScreenAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportOrReimportDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolCaracteristicAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryReferentialAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallOrReinstallDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ManageDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewCruiseAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewFishingOperationAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewProgramAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAccidentalBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAllIndividualObservationBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosSubBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveIndividualObservationBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveMarineLitterBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesSubBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCatchBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveSampleCategoryModelAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectCruiseAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowConfigAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowReportAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ValidateCatchesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ValidateSelectedCruiseCatchesAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ViewGearCaracteristicsAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/VesselTypeEnum.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SecondaryVesselTypeEnum.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SelectedCategoryAble.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecoratorComparator.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/TableViewMode.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiBeanMonitor.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/UIMessageNotifier.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorRowModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicRow.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/profiling/META-INF/aop.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel-warning-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml
branches/tutti-3.4.x/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java
branches/tutti-3.4.x/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java
branches/tutti-3.4.x/tutti-ui-swing/src/test/resources/log4j.properties
Modified: branches/tutti-3.4.x/pom.xml
===================================================================
--- branches/tutti-3.4.x/pom.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/pom.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -158,6 +158,8 @@
<!-- license header configuration -->
<license.organizationName>Ifremer</license.organizationName>
<license.licenseName>gpl_v3</license.licenseName>
+ <license.addSvnKeyWords>false</license.addSvnKeyWords>
+ <licensePluginVersion>1.7</licensePluginVersion>
<!-- Site configuration -->
<locales>fr</locales>
Modified: branches/tutti-3.4.x/src/site/rst/dbversions.rst
===================================================================
--- branches/tutti-3.4.x/src/site/rst/dbversions.rst 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/site/rst/dbversions.rst 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
.. -
.. * #%L
.. * Tutti
-.. * $Id$
-.. * $HeadURL$
.. * %%
-.. * Copyright (C) 2012 - 2013 Ifremer
+.. * Copyright (C) 2012 - 2014 Ifremer
.. * %%
.. * This program is free software: you can redistribute it and/or modify
.. * it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/src/site/rst/features.rst
===================================================================
--- branches/tutti-3.4.x/src/site/rst/features.rst 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/site/rst/features.rst 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
.. -
.. * #%L
.. * Tutti
-.. * $Id$
-.. * $HeadURL$
.. * %%
-.. * Copyright (C) 2012 - 2013 Ifremer
+.. * Copyright (C) 2012 - 2014 Ifremer
.. * %%
.. * This program is free software: you can redistribute it and/or modify
.. * it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/src/site/rst/index.rst
===================================================================
--- branches/tutti-3.4.x/src/site/rst/index.rst 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/site/rst/index.rst 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
.. -
.. * #%L
.. * Tutti
-.. * $Id$
-.. * $HeadURL$
.. * %%
-.. * Copyright (C) 2012 Ifremer
+.. * Copyright (C) 2012 - 2014 Ifremer
.. * %%
.. * This program is free software: you can redistribute it and/or modify
.. * it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/src/site/rst/mapping.rst
===================================================================
--- branches/tutti-3.4.x/src/site/rst/mapping.rst 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/site/rst/mapping.rst 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
.. -
.. * #%L
-.. * Tutti :: Persistence Adagio (impl)
-.. * $Id$
-.. * $HeadURL$
+.. * Tutti
.. * %%
-.. * Copyright (C) 2012 - 2013 Ifremer
+.. * Copyright (C) 2012 - 2014 Ifremer
.. * %%
.. * This program is free software: you can redistribute it and/or modify
.. * it under the terms of the GNU General Public License as
@@ -31,4 +29,4 @@
Cette partie de la documentation est désormais dans `l'aide en ligne`_.
-.. _l'aide en ligne: ./help/fr/dbMapping.html
\ No newline at end of file
+.. _l'aide en ligne: ./help/fr/dbMapping.html
Modified: branches/tutti-3.4.x/src/site/rst/referential.rst
===================================================================
--- branches/tutti-3.4.x/src/site/rst/referential.rst 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/site/rst/referential.rst 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
.. -
.. * #%L
-.. * Tutti :: Persistence Adagio (impl)
-.. * $Id$
-.. * $HeadURL$
+.. * Tutti
.. * %%
-.. * Copyright (C) 2012 - 2013 Ifremer
+.. * Copyright (C) 2012 - 2014 Ifremer
.. * %%
.. * This program is free software: you can redistribute it and/or modify
.. * it under the terms of the GNU General Public License as
@@ -433,4 +431,4 @@
p.description AS objectTypeDescription
FROM ObjectTypeImpl p
-*État:* Valide.
\ No newline at end of file
+*État:* Valide.
Modified: branches/tutti-3.4.x/src/site/site_fr.xml
===================================================================
--- branches/tutti-3.4.x/src/site/site_fr.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/site/site_fr.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/src/update/tutti-application.properties
===================================================================
--- branches/tutti-3.4.x/src/update/tutti-application.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/update/tutti-application.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/src/update/tutti-data.properties
===================================================================
--- branches/tutti-3.4.x/src/update/tutti-data.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/update/tutti-data.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,18 +4,18 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public
# License along with this program. If not, see
# <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -36,4 +36,4 @@
report.version=@reportVersion@
report.url=zip:http://appup.nuiton.org/tutti/auth/tutti-report-@reportVersi…
-report.auth=true
\ No newline at end of file
+report.auth=true
Modified: branches/tutti-3.4.x/src/update/update-tutti.properties
===================================================================
--- branches/tutti-3.4.x/src/update/update-tutti.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/src/update/update-tutti.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,18 +4,18 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public
# License along with this program. If not, see
# <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -75,4 +75,4 @@
report.version=@reportVersion@
report.url=zip:http://appup.nuiton.org/tutti/auth/tutti-report-@reportVersi…
-report.auth=true
\ No newline at end of file
+report.auth=true
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/assembly/log4j.properties
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/assembly/log4j.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/assembly/log4j.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -29,4 +29,4 @@
log4j.logger.javax.bluetooth=DEBUG
#Uncomment this for some debug informations
-#log4j.logger.fr.ifremer.tutti.ichtyometer.feed=DEBUG
\ No newline at end of file
+#log4j.logger.fr.ifremer.tutti.ichtyometer.feed=DEBUG
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/assembly/tools.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/assembly/tools.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/assembly/tools.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -60,4 +60,4 @@
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/IchtyometerClient.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/LocalDeviceNotFoundException.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceChooser.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceNotFoundException.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceServiceNotFoundException.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderEvent.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderListener.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/Command.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/IchtyometerCommandException.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/IchtyometerClientTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngineTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Ichtyometer API
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ichtyometer/src/test/resources/log4j.properties
===================================================================
--- branches/tutti-3.4.x/tutti-ichtyometer/src/test/resources/log4j.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ichtyometer/src/test/resources/log4j.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -28,4 +28,4 @@
log4j.appender.A1.layout.ConversionPattern=%d %-4r [%t] %-5p %c %x - %m%n
log4j.logger.javax.bluetooth=DEBUG
-#log4j.logger.fr.ifremer.tutti.ichtyometer.feed.FeedReaderRecord=DEBUG
\ No newline at end of file
+#log4j.logger.fr.ifremer.tutti.ichtyometer.feed.FeedReaderRecord=DEBUG
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/DatabaseSanityServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTask.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselFeatures.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/sanity/task/DatabaseSanityTaskVesselRegistrationPeriod.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
@@ -133,4 +131,4 @@
}
return tuttiTableMetadata;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroResult.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroResult.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroResult.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
@@ -452,4 +450,4 @@
public String getTableLogPrefix() {
return "[" + getName() + "]";
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableTool.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/ReferentialSynchroSpecificTableTask.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselFeaturesReferentialSynchroSpecificTableTaskImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/specific/VesselRegistrationPeriodReferentialSynchroSpecificTableTaskImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/LabelAware.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/LabelAware.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/LabelAware.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationProvider.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationProvider.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationProvider.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -60,4 +58,4 @@
public ConfigActionDef[] getActions() {
return new ConfigActionDef[0];
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Service
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceServiceImplementor.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceServiceImplementor.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceServiceImplementor.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/GearPhysicalFeaturesDaoImplTutti.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/GearPhysicalFeaturesDaoImplTutti.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/GearPhysicalFeaturesDaoImplTutti.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/GearPhysicalFeaturesDaoTutti.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/GearPhysicalFeaturesDaoTutti.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/GearPhysicalFeaturesDaoTutti.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/CaracteristicMap.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntity.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntity.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntity.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -44,4 +42,4 @@
void setId(Integer id);
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntityBean.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntityBean.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntityBean.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -107,4 +105,4 @@
protected <B> B getChild(List<B> child, int index) {
return CollectionUtil.getOrNull(child, index);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEnumerable.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEnumerable.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEnumerable.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/BatchContainer.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/BatchContainer.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/BatchContainer.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelEntry.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelEntry.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelEntry.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocol1.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocol1.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocol1.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocolBean1.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocolBean1.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocolBean1.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocol1.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocol1.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocol1.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocolBean1.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocolBean1.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocolBean1.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrder.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrder.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrder.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrderBean.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrderBean.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrderBean.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -79,4 +77,4 @@
@Transactional(readOnly = false)
void deleteCatchBatch(String fishingOperationId);
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -52,4 +50,4 @@
@Transactional(readOnly = false)
void deleteIndividualObservationBatchForFishingOperation(String fishingOperationId);
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MeasurementPersistenceHelper.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MeasurementPersistenceHelper.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MeasurementPersistenceHelper.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SamplePersistenceHelper.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SamplePersistenceHelper.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SamplePersistenceHelper.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -149,4 +147,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/TuttiCatchBatchValidator.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/TuttiCatchBatchValidator.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/TuttiCatchBatchValidator.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiRunListener.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiRunListener.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiRunListener.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiRunner.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiRunner.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiRunner.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
@@ -115,4 +113,4 @@
String unit = t("application.common.unit");
return String.format("%s (%s %s)", tip, unit, getLabel());
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/resources/applicationContext-service-tutti.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
#%L
- Tutti :: Persistence API
+ Tutti :: Persistence
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -142,4 +142,4 @@
<property name="maxElementsOnDisk" value="1000"/>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/resources/ehcache.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/resources/ehcache.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/resources/ehcache.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/resources/queries-override.hbm.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/resources/queries-override.hbm.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/resources/queries-override.hbm.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!--
#%L
- Tutti :: Persistence API
+ Tutti :: Persistence
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/resources/tutti-db-conf.properties
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/resources/tutti-db-conf.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/resources/tutti-db-conf.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
###
# #%L
-# Tutti :: Persistence API
-# $Id$
-# $HeadURL$
+# Tutti :: Persistence
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
@@ -51,4 +49,4 @@
adagio.cache.use_tree_cache=true
# migration configuration
-liquibase.should.run=false
\ No newline at end of file
+liquibase.should.run=false
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/resources/tutti-db-enumerations.properties
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/resources/tutti-db-enumerations.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
###
# #%L
-# Tutti :: Persistence API
-# $Id$
-# $HeadURL$
+# Tutti :: Persistence
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
@@ -422,4 +420,4 @@
TranscribingTypeId.TAXINOMIE_REFTAX_MNEMONIQUE=55
TranscribingTypeId.TAXINOMIE_COMMUN_NOM_VERNACULAIRE=56
-MatrixId.PRODUCT_BATCH=1
\ No newline at end of file
+MatrixId.PRODUCT_BATCH=1
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/resources/tuttiBeanRefFactory.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/resources/tuttiBeanRefFactory.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/resources/tuttiBeanRefFactory.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
#%L
- Tutti :: Persistence API
+ Tutti :: Persistence
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -44,4 +44,4 @@
</constructor-arg>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/xmi/tutti-persistence.properties
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/xmi/tutti-persistence.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/xmi/tutti-persistence.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
###
# #%L
-# Tutti :: Persistence API
-# $Id$
-# $HeadURL$
+# Tutti :: Persistence
# %%
-# Copyright (C) 2012 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadataTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Persistence
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFileTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFileTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFileTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Persistence API
- * $Id$
- * $HeadURL$
+ * Tutti :: Persistence
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/resources/applicationContext-service-resources.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/resources/applicationContext-service-resources.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/resources/applicationContext-service-resources.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,10 @@
<!--
#%L
- Tutti :: Persistence API
+ Tutti :: Persistence
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -34,4 +34,4 @@
<bean id="tuttiEnumerationFile" init-method="init" lazy-init="true"
class="fr.ifremer.tutti.persistence.service.TuttiEnumerationFile"/>
-</beans>
\ No newline at end of file
+</beans>
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/resources/beanRefFactoryWitNoDb.xml
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/resources/beanRefFactoryWitNoDb.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/resources/beanRefFactoryWitNoDb.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
#%L
- Tutti :: Persistence API
+ Tutti :: Persistence
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -39,4 +39,4 @@
</constructor-arg>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/resources/log4j.properties
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/resources/log4j.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/resources/log4j.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
###
# #%L
-# Tutti :: Persistence API
-# $Id$
-# $HeadURL$
+# Tutti :: Persistence
# %%
-# Copyright (C) 2012 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/resources/tutti-test-read-dbEmpty.properties
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/resources/tutti-test-read-dbEmpty.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/resources/tutti-test-read-dbEmpty.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
###
# #%L
-# Tutti :: Persistence API
-# $Id$
-# $HeadURL$
+# Tutti :: Persistence
# %%
-# Copyright (C) 2012 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/resources/tutti-test-read.properties
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/resources/tutti-test-read.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/resources/tutti-test-read.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
###
# #%L
-# Tutti :: Persistence API
-# $Id$
-# $HeadURL$
+# Tutti :: Persistence
# %%
-# Copyright (C) 2012 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-persistence/src/test/server.properties
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/test/server.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-persistence/src/test/server.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
###
# #%L
-# Tutti :: Persistence API
-# $Id$
-# $HeadURL$
+# Tutti :: Persistence
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
@@ -24,4 +22,4 @@
server.database.0=file:db/allegro
server.dbname.0=allegro
#server.database.1=file:dbEmpty/allegro
-#server.dbname.1=allegroEmpty
\ No newline at end of file
+#server.dbname.1=allegroEmpty
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Application
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/ClosedPersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/ClosedPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/ClosedPersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Application
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Application
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: UI
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Application
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,11 +2,9 @@
/*
* #%L
- * Tutti :: Application
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/ValidationService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/ValidationService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/ValidationService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AccidentalCatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CaracteristicRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchFrequencyRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -69,4 +67,4 @@
public CatchFrequencyRow newEmptyInstance() {
return new CatchFrequencyRow();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -157,4 +155,4 @@
public void setToConfirm(boolean toConfirm) {
this.toConfirm = toConfirm;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -84,4 +82,4 @@
public CatchRow newEmptyInstance() {
return new CatchRow();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/IndividualObservationRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -166,4 +164,4 @@
rows.add(row);
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -485,4 +483,4 @@
currentRow.addSampleCategory(sampleCategory);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -280,4 +278,4 @@
}
return result;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -73,4 +71,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/GearCaracteristicExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -142,4 +140,4 @@
rows.add(row);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -460,4 +458,4 @@
Serializable serializable = gearUseFeatures == null ? null : gearUseFeatures.get(caracteristic);
return serializable;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -91,4 +89,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ParameterExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -102,4 +100,4 @@
public Serializable getValue() {
return value;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -74,4 +72,4 @@
exportContext.addSpecies(row.getSpecies());
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SpeciesExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -67,4 +65,4 @@
row.setCountry(country);
rows.add(row);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/SurveyExportRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL:$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,11 +1,8 @@
/*
* #%L
- * EchoBase :: Services
- *
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2011 - 2012 Ifremer, Codelutin
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,11 +1,8 @@
/*
* #%L
- * EchoBase :: Services
- *
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2011 - 2012 Ifremer, Codelutin
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -205,4 +203,4 @@
public List<Integer> getMandatorySampleCategoryId() {
return delegate.getMandatorySampleCategoryId();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -115,4 +113,4 @@
return new SpeciesRow();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportBatchModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportResult.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Directions.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Directions.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Directions.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL:$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialSynchronizeService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialSynchronizeService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialSynchronizeService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -34,4 +34,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -50,4 +50,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Cruise-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Cruise-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Cruise-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-warning-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-warning-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-warning-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-warning-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-warning-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-warning-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -60,4 +60,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/MarineLitterBatch-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -48,4 +48,4 @@
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Program-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Program-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/Program-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -50,4 +50,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocol-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocol-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocol-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -51,4 +51,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/ftl/catchesReport_fr.ftl 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -111,4 +111,4 @@
</#list>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-service/src/main/resources/validators.xml
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/resources/validators.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/main/resources/validators.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/BeanValidatorDetectorTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/BeanValidatorDetectorTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/BeanValidatorDetectorTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,11 +1,8 @@
/*
* #%L
- * ObServe :: Validation
- *
- * $Id$
- * $HeadURL$
+ * Tutti :: Service
* %%
- * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL: https://svn.codelutin.com/tutti/branches/3.3.6/tutti-service/src/test/java/… $
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL: https://svn.codelutin.com/tutti/branches/3.3.6/tutti-service/src/test/java/… $
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL:$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL:$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
@@ -174,4 +172,4 @@
Assert.assertTrue("Expected species not found: " + expectedSpecies, expectedSpecies.isEmpty());
Assert.assertTrue("Unexpected species found: " + unexpectedSpecies, unexpectedSpecies.isEmpty());
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/log4j.properties
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/log4j.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/log4j.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
@@ -32,4 +32,4 @@
log4j.logger.org.nuiton.i18n=ERROR
#See https://forum.hibernate.org/viewtopic.php?p=2404391
-log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=ERROR
\ No newline at end of file
+log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=ERROR
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/css/common.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -400,4 +398,4 @@
.chart-resize {
font-family: "Arial";
font-size: 6pt;
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/common.js 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/js/messages.js 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: Service
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -233,4 +231,4 @@
return getMessage(trueMessageKey);
}
return getMessage(falseMessageKey);
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/common/nls/common.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
@@ -23,4 +23,4 @@
###
tutti.persistence.db.directory=src/test/dbCGFS
tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbCGFS/allegro
-#tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro
\ No newline at end of file
+#tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbExport.properties
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbExport.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbExport.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
@@ -23,4 +23,4 @@
###
tutti.persistence.db.directory=src/test/dbExport
tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbExport/allegro
-#tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro
\ No newline at end of file
+#tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro
Modified: branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbMedits.properties
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbMedits.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-service/src/test/resources/tutti-test-read-dbMedits.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 - 2013 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
@@ -22,4 +22,4 @@
# #L%
###
tutti.persistence.db.directory=src/test/dbMedits
-tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbMedits/allegro
\ No newline at end of file
+tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbMedits/allegro
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-linux-i586.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-linux-i586.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-linux-i586.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-linux-x64.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-linux-x64.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-linux-x64.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-windows-i586.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-windows-i586.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-windows-i586.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-windows-x64.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-windows-x64.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/full-windows-x64.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/help.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/help.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/help.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -51,4 +51,4 @@
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/i18n.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/i18n.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/i18n.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -52,4 +52,4 @@
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/standalone.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/standalone.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/standalone.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/tutti-full-component.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/filtered-resources/log4j.properties
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/css/style.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/css/style.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/css/style.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -83,4 +81,4 @@
.table > tbody > tr > td:first-child {
white-space: nowrap;
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/config.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/config.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/config.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -134,4 +134,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/dbManager.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/dbManager.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/dbManager.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -7,7 +7,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -79,4 +79,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editCruise.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editCruise.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editCruise.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -205,4 +205,4 @@
</dl>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editFishingOperation.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editFishingOperation.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editFishingOperation.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -1209,4 +1209,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editProgram.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editProgram.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editProgram.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -73,4 +73,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editProtocol.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editProtocol.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editProtocol.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -251,4 +251,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editSampleCategory.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editSampleCategory.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/editSampleCategory.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -79,4 +79,4 @@
une ligne + [Monter] ou [Descendre].
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/faq.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/faq.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/faq.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -341,4 +341,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/fonctionnalites_transversales.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/fonctionnalites_transversales.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/fonctionnalites_transversales.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -133,4 +133,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/index.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/index.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/index.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -202,4 +202,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -99,4 +99,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/menu.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/menu.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/menu.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -265,4 +265,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/navbar.js
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/navbar.js 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/navbar.js 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -133,4 +131,4 @@
document.write(' </ul>');
document.write(' </div>');
document.write(' </div>');
-document.write('</div>');
\ No newline at end of file
+document.write('</div>');
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/report.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/report.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/report.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -71,4 +71,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/selectCruise.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/selectCruise.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/en/selectCruise.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -146,4 +146,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/config.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/config.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/config.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -132,4 +132,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/dbManager.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/dbManager.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/dbManager.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -7,7 +7,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -77,4 +77,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/dbMapping.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/dbMapping.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/dbMapping.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -7,7 +7,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -2617,4 +2617,4 @@
<p>MatrixId.PRODUCT_BATCH=1</p>
</div>
-</body>
\ No newline at end of file
+</body>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editCruise.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editCruise.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editCruise.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -203,4 +203,4 @@
</dl>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editFishingOperation.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -1276,4 +1276,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editProgram.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editProgram.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editProgram.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -71,4 +71,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editProtocol.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editProtocol.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editProtocol.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -249,4 +249,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editSampleCategory.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editSampleCategory.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/editSampleCategory.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -77,4 +77,4 @@
une ligne + [Monter] ou [Descendre].
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/faq.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/faq.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/faq.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -340,4 +340,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/fonctionnalites_transversales.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/fonctionnalites_transversales.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/fonctionnalites_transversales.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -131,4 +131,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/genericExport.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/genericExport.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/genericExport.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,18 +6,16 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -484,4 +482,4 @@
</table>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/index.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/index.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/index.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -209,4 +209,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -98,4 +98,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/menu.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/menu.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/menu.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -269,4 +269,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/navbar.js
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/navbar.js 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/navbar.js 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -140,4 +138,4 @@
document.write(' </ul>');
document.write(' </div>');
document.write(' </div>');
-document.write('</div>');
\ No newline at end of file
+document.write('</div>');
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/report.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/report.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/report.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -70,4 +70,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/selectCruise.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/selectCruise.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/selectCruise.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -153,4 +153,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/validation.html
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/validation.html 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/help/fr/validation.html 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,20 +5,18 @@
#%L
Tutti :: UI
$Id$
- $HeadURL: https://svn.forge.codelutin.com/svn/tutti/trunk/tutti-ui-swing/src/main/hel… $
+ $HeadURL:$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -1007,4 +1005,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -181,4 +179,4 @@
System.exit(exitCode);
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiScreen.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractChangeLocaleAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractChangeLocaleAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractChangeLocaleAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractChangeScreenAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractChangeScreenAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractChangeScreenAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractExportMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractExportMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractExportMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -92,4 +90,4 @@
super.releaseAction();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractImportMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractImportMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractImportMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractMainUITuttiAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractMainUITuttiAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractMainUITuttiAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddBenthosProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddBenthosProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddBenthosProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddSpeciesProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddSpeciesProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddSpeciesProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditCatchBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditCatchBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditCatchBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -86,4 +84,4 @@
getEditAction().loadCatchBatch(operation);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ChangeToLocaleFRAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ChangeToLocaleFRAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ChangeToLocaleFRAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ChangeToLocaleUKAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ChangeToLocaleUKAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ChangeToLocaleUKAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CleanBatchWeightsAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CleanBatchWeightsAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CleanBatchWeightsAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -142,4 +140,4 @@
sendMessage(t("tutti.editCatchBatch.action.cleanWeights.done", nbErrors));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloneProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloneProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloneProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -84,4 +82,4 @@
handler.reloadDbManagerText();
super.postFailedAction(error);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteFishingOperationAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteFishingOperationAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteFishingOperationAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -87,4 +85,4 @@
sendMessage(t("tutti.editFishingOperation.message.operation.deleted", decorate(fishingOperation)));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -96,4 +94,4 @@
getHandler().resetEditProtolAction();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditGearCaracteristicsAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditGearCaracteristicsAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditGearCaracteristicsAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProgramAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProgramAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProgramAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSampleCategoryModelAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSampleCategoryModelAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSampleCategoryModelAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -54,4 +52,4 @@
}
return result;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedCruiseAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedCruiseAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedCruiseAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedCruiseCatchesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedCruiseCatchesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedCruiseCatchesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedProgramAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedProgramAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedProgramAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSelectedProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAllCaracteristicAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAllCaracteristicAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAllCaracteristicAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -95,4 +93,4 @@
sendMessage(t("tutti.flash.info.all.caractristic.exported", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -133,4 +131,4 @@
getUI().getHandler().changeTitle();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseValidationMessagesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseValidationMessagesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseValidationMessagesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -127,4 +125,4 @@
// make sure title is reloaded
getUI().getHandler().changeTitle();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportOperationValidationMessagesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportOperationValidationMessagesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportOperationValidationMessagesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolBenthosAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolBenthosAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolBenthosAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -114,4 +112,4 @@
sendMessage(t("tutti.flash.info.species.exported.from.protocol",
file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolCaracteristicAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolCaracteristicAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolCaracteristicAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -102,4 +100,4 @@
sendMessage(t("tutti.flash.info.caractristic.exported.from.protocol",
file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolSpeciesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolSpeciesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolSpeciesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -114,4 +112,4 @@
sendMessage(t("tutti.flash.info.species.exported.from.protocol",
file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -116,4 +114,4 @@
sendMessage(t("tutti.flash.info.species.exported.from.protocol",
file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -99,4 +97,4 @@
super.postSuccessAction();
sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export.success", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -100,4 +98,4 @@
super.postSuccessAction();
sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export.success", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -99,4 +97,4 @@
super.postSuccessAction();
sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export.success", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -99,4 +97,4 @@
super.postSuccessAction();
sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GoToPreviousScreenAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GoToPreviousScreenAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GoToPreviousScreenAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -328,4 +326,4 @@
super.postFailedAction(error);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportOrReimportDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportOrReimportDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportOrReimportDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -145,4 +143,4 @@
}
sendMessage(message);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolCaracteristicAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolCaracteristicAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolCaracteristicAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -113,4 +111,4 @@
file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -145,4 +143,4 @@
}
sendMessage(message);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -102,4 +100,4 @@
sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -101,4 +99,4 @@
super.postSuccessAction();
sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryReferentialAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryReferentialAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryReferentialAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -100,4 +98,4 @@
super.postSuccessAction();
sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -100,4 +98,4 @@
super.postSuccessAction();
sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success", file));
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -122,4 +120,4 @@
getActionEngine().runInternalAction(getHandler(), OpenDbAction.class);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallOrReinstallDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallOrReinstallDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallOrReinstallDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ManageDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ManageDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ManageDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -39,4 +37,4 @@
super(handler, true, TuttiScreen.MANAGE_DB);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewCruiseAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewCruiseAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewCruiseAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewFishingOperationAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewFishingOperationAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewFishingOperationAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewProgramAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewProgramAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewProgramAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/NewProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -372,4 +370,4 @@
super.postFailedAction(error);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -163,4 +161,4 @@
RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -142,4 +140,4 @@
RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -49,4 +47,4 @@
RunTutti.closeTutti(getHandler(), RunTutti.UPATE_EXIT_CODE);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAccidentalBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAccidentalBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAccidentalBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAllIndividualObservationBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAllIndividualObservationBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAllIndividualObservationBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosSubBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosSubBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosSubBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveIndividualObservationBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveIndividualObservationBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveIndividualObservationBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveMarineLitterBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveMarineLitterBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveMarineLitterBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -123,4 +121,4 @@
TuttiUIUtil.selectFirstCellOnFirstRowAndStopEditing(table);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesSubBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesSubBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesSubBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCatchBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCatchBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCatchBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -106,4 +104,4 @@
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveSampleCategoryModelAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveSampleCategoryModelAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveSampleCategoryModelAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -65,4 +63,4 @@
model.setModify(false);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectCruiseAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectCruiseAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectCruiseAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowConfigAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowConfigAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowConfigAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowReportAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowReportAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowReportAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -164,4 +162,4 @@
public boolean isReload() {
return reload;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -151,4 +149,4 @@
handler.reloadDbManagerText();
super.postFailedAction(error);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -149,4 +147,4 @@
public boolean isReload() {
return reload;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ValidateCatchesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ValidateCatchesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ValidateCatchesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ValidateSelectedCruiseCatchesAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ValidateSelectedCruiseCatchesAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ValidateSelectedCruiseCatchesAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ViewGearCaracteristicsAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ViewGearCaracteristicsAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ViewGearCaracteristicsAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -91,4 +89,4 @@
enabled: {model.isModify() && model.isValid()};
_applicationAction: {fr.ifremer.tutti.ui.swing.action.SaveSampleCategoryModelAction.class};
_help: {"tutti.editSampleCategoryModel.action.save.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -98,4 +98,4 @@
</row>
</Table>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -43,4 +43,4 @@
<TuttiHelpBroker id='broker' constructorParams='"tutti.config.help"'/>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -309,4 +307,4 @@
#gearCaracteristicsEditorTitledPanel {
title: "tutti.editCruise.gearCaracteristics.title";
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -255,4 +255,4 @@
constructorParams='this'/>
</JXTitledPanel>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -518,4 +516,4 @@
public boolean containsAllHeadOfSortRoom(Collection<Person> headOfSortRoom) {
return false;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,7 +2,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -66,4 +66,4 @@
i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.save.mnemonic";
enabled: {model.isEditable() && model.isValid()};
_help: {"tutti.editIndividualObservationCaracteristics.action.save.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,8 +1,10 @@
<!--
#%L
Tutti :: UI
+ $Id$
+ $HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -79,4 +81,4 @@
</row>
-</Table>
\ No newline at end of file
+</Table>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -57,4 +55,4 @@
#navigation {
rootVisible: false;
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -69,4 +69,4 @@
constructorParams='this'>
</FishingOperationsUI>
-</JSplitPane>
\ No newline at end of file
+</JSplitPane>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/VesselTypeEnum.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/VesselTypeEnum.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/VesselTypeEnum.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -84,4 +82,4 @@
_applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportDbAction.class};
toolTipText: "tutti.dbManager.action.exportDb.tip";
_help: {"tutti.dbManager.action.exportDb.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -245,4 +243,4 @@
_applicationAction: {fr.ifremer.tutti.ui.swing.action.ValidateCatchesAction.class};
enabled: {model.isValid() && model.isCruiseFound()};
_help: {"tutti.selectCruise.action.validateCatches.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -1451,4 +1449,4 @@
public boolean containsAllRecorderPerson(Collection<Person> recorderPerson) {
return false;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -93,4 +93,4 @@
<!-- When no fishing operation selected -->
<JLabel id='noTraitPane' constraints='BorderLayout.CENTER'/>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SecondaryVesselTypeEnum.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SecondaryVesselTypeEnum.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SecondaryVesselTypeEnum.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -437,4 +437,4 @@
</row>
</Table>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -630,4 +628,4 @@
}
return result;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/FrequencyConfigurationMode.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -47,4 +45,4 @@
text: "tutti.multiPostImportLog.close";
toolTipText: "tutti.multiPostImportLog.close.tip";
i18nMnemonic: "tutti.multiPostImportLog.close.mnemonic";
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -32,4 +32,4 @@
<JButton id="closeButton" constraints='BorderLayout.SOUTH'
onActionPerformed='dispose();'/>
-</JDialog>
\ No newline at end of file
+</JDialog>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SelectedCategoryAble.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SelectedCategoryAble.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SelectedCategoryAble.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecoratorComparator.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecoratorComparator.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecoratorComparator.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortMode.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesSortableRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/TableViewMode.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/TableViewMode.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/TableViewMode.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -107,4 +105,4 @@
result.setValid(false);
return result;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -85,4 +85,4 @@
minimumSize="{new Dimension(10,30)}"
maximumSize="{new Dimension(10,30)}"
preferredSize="{new Dimension(10,30)}"/-->
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -96,4 +94,4 @@
return false;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,7 +2,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -142,4 +142,4 @@
toolTipText: "tutti.createAccidentalBatch.action.cancel.tip";
i18nMnemonic: "tutti.createAccidentalBatch.action.cancel.mnemonic";
_help: {"tutti.createAccidentalBatch.action.cancel.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,8 +1,10 @@
<!--
#%L
Tutti :: UI
+ $Id$
+ $HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -146,4 +148,4 @@
<JButton id='saveAndContinueButton' onActionPerformed='handler.saveAndContinue()'/>
<JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/>
</JPanel>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -1740,4 +1738,4 @@
(SpeciesBatchDecorator<BenthosBatchRowModel>) SpeciesBatchRowHelper.getSpeciesColumnDecorator(speciesColumn);
return decorator;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,18 +4,16 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -267,4 +265,4 @@
protected CreateBenthosBatchUIModel newEntity() {
return new CreateBenthosBatchUIModel(sampleCategoryModel);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -147,4 +145,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -301,4 +299,4 @@
toolTipText: "tutti.editBenthosFrequencies.action.reset.tip";
i18nMnemonic: "tutti.editBenthosFrequencies.action.reset.mnemonic";
_help: {"tutti.editBenthosFrequencies.action.reset.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -229,4 +229,4 @@
<JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/>
</JPanel>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -150,4 +148,4 @@
protected SplitBenthosBatchRowModel newEntity() {
return new SplitBenthosBatchRowModel();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -105,4 +103,4 @@
}
return result;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -173,4 +171,4 @@
this.splitMode = splitMode;
firePropertyChange(PROPERTY_SPLIT_MODE, oldValue,splitMode);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -87,4 +85,4 @@
_applicationAction: {fr.ifremer.tutti.ui.swing.action.RemoveAllIndividualObservationBatchAction.class};
enabled: {model.isRemoveBatchEnabled()};
_help: {"tutti.editIndividualObservationBatch.action.removeAllBatch.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,8 +1,10 @@
<!--
#%L
Tutti :: UI
+ $Id$
+ $HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -90,4 +92,4 @@
minimumSize="{new Dimension(10,30)}"
maximumSize="{new Dimension(10,30)}"
preferredSize="{new Dimension(10,30)}"/-->
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,7 +2,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -130,4 +130,4 @@
toolTipText: "tutti.createIndividualObservationBatch.action.cancel.tip";
i18nMnemonic: "tutti.createIndividualObservationBatch.action.cancel.mnemonic";
_help: {"tutti.createIndividualObservationBatch.action.cancel.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,8 +1,10 @@
<!--
#%L
Tutti :: UI
+ $Id$
+ $HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -132,4 +134,4 @@
<JButton id='saveAndContinueButton' onActionPerformed='handler.saveAndContinue()'/>
<JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/>
</JPanel>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -93,4 +91,4 @@
result.setValid(false);
return result;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -100,4 +98,4 @@
_applicationAction: {fr.ifremer.tutti.ui.swing.action.RemoveMarineLitterBatchAction.class};
enabled: {model.isRemoveBatchEnabled()};
_help: {"tutti.editMarineLitterBatch.action.removeBatch.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -108,4 +108,4 @@
maximumSize="{new Dimension(10,30)}"
preferredSize="{new Dimension(10,30)}"/-->
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -428,4 +426,4 @@
row.getMarineLitterCategory());
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -127,4 +125,4 @@
public boolean isCloseable() {
return false;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -116,4 +114,4 @@
toolTipText: "tutti.createMarineLitterBatch.action.cancel.tip";
i18nMnemonic: "tutti.createMarineLitterBatch.action.cancel.mnemonic";
_help: {"tutti.createMarineLitterBatch.action.cancel.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -115,4 +115,4 @@
<JButton id='saveAndContinueButton' onActionPerformed='handler.saveAndContinue()'/>
<JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/>
</JPanel>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -130,4 +128,4 @@
setMarineLitterSizeCategory(null);
setNumber(null);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -79,4 +79,4 @@
</Table>
-</JDialog>
\ No newline at end of file
+</JDialog>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -336,4 +334,4 @@
value: "DESC";
selected: {model.isSpeciesSortModeDesc()};
buttonGroup: "speciesSort";
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,18 +4,16 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,18 +4,16 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -268,4 +266,4 @@
protected CreateSpeciesBatchUIModel newEntity() {
return new CreateSpeciesBatchUIModel(sampleCategoryModel);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -147,4 +145,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -230,4 +230,4 @@
<JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/>
</JPanel>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -139,4 +137,4 @@
protected SplitSpeciesBatchRowModel newEntity() {
return new SplitSpeciesBatchRowModel();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -106,4 +104,4 @@
return result;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -172,4 +170,4 @@
this.splitMode = splitMode;
firePropertyChange(PROPERTY_SPLIT_MODE, oldValue,splitMode);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -49,4 +47,4 @@
toolTipText: "tutti.gearUseFeatureTable.action.removeCaracteristic.tip";
i18nMnemonic: "tutti.gearUseFeatureTable.action.removeCaracteristic.mnemonic";
enabled: {model.isRemoveCaracteristicEnabled()};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -68,4 +68,4 @@
</JScrollPane>
</cell>
</row>
-</Table>
\ No newline at end of file
+</Table>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -49,4 +47,4 @@
toolTipText: "tutti.vesselUseFeatureTable.action.removeCaracteristic.tip";
i18nMnemonic: "tutti.vesselUseFeatureTable.action.removeCaracteristic.mnemonic";
enabled: {model.isRemoveCaracteristicEnabled()};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -69,4 +69,4 @@
</JScrollPane>
</cell>
</row>
-</Table>
\ No newline at end of file
+</Table>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -103,4 +103,4 @@
</row>
</Table>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -665,4 +663,4 @@
public void setVersion(Integer version) {
editObject.setVersion(version);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -117,4 +115,4 @@
_applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportTemporaryPersonAction.class};
toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryPerson.tip";
_help: {"tutti.manageTemporaryReferential.action.importTemporaryPerson.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -75,4 +73,4 @@
public SwingValidator<TuttiUIContext> getValidator() {
return null;
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -112,4 +112,4 @@
</row>
</Table>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -151,4 +149,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiBeanMonitor.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiBeanMonitor.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiBeanMonitor.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/UIMessageNotifier.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/UIMessageNotifier.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/UIMessageNotifier.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -106,4 +106,4 @@
</Table>
</JScrollPane>
</JXTitledPanel>
-</JDialog>
\ No newline at end of file
+</JDialog>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -51,4 +49,4 @@
actionIcon: "delete";
toolTipText: "tutti.attachmentEditor.action.remove.tip";
i18nMnemonic: "tutti.attachmentEditor.action.remove.mnemonic";
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -52,4 +52,4 @@
onActionPerformed='handler.removeAttachment(this)'/>
</JToolBar>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/AuthenticationInfo.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,8 +1,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
@@ -53,4 +51,4 @@
text: "tutti.common.validate";
toolTipText: "tutti.common.validate";
i18nMnemonic: "tutti.common.validate.mnemonic";
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -80,4 +80,4 @@
</Table>
-</JDialog>
\ No newline at end of file
+</JDialog>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapColumnUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorRowModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorRowModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorRowModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,7 +2,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -62,4 +62,4 @@
toolTipText: "tutti.editIndividualObservationCaracteristics.action.save.tip";
i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.save.mnemonic";
_help: {"tutti.editIndividualObservationCaracteristics.action.save.help"};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,8 +1,10 @@
<!--
#%L
Tutti :: UI
+ $Id$
+ $HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -76,4 +78,4 @@
</JPanel>
</cell>
</row>
-</Table>
\ No newline at end of file
+</Table>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
* #%L
* Tutti :: UI
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -136,4 +134,4 @@
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -140,4 +138,4 @@
editorButton.setBean(null);
super.cancelCellEditing();
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -59,4 +59,4 @@
</JScrollPane>
</JXTitledPanel>
-</JDialog>
\ No newline at end of file
+</JDialog>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,18 +4,16 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -50,4 +48,4 @@
]]>
</script>
-</jaxx.runtime.swing.editor.NumberEditor>
\ No newline at end of file
+</jaxx.runtime.swing.editor.NumberEditor>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -164,4 +162,4 @@
return super.getTableCellRendererComponent(table, decorator.toString(entity), isSelected, hasFocus, row, column);
}
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -54,4 +52,4 @@
toolTipText: "tutti.createSpeciesMelag.action.validate.tip";
i18nMnemonic: "tutti.createSpeciesMelag.action.validate.mnemonic";
enabled: { editor.getModel() != null };
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -65,4 +65,4 @@
onActionPerformed='editor.setModel(null); dispose();'/>
<JButton id='validateButton' onActionPerformed='dispose();'/>
</JPanel>
-</JDialog>
\ No newline at end of file
+</JDialog>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,8 +3,6 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
* Copyright (C) 2012 - 2014 Ifremer
* %%
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,10 +1,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -42,4 +40,4 @@
toolTipText: "tutti.selectSpecies.action.validate.tip";
i18nMnemonic: "tutti.selectSpecies.action.validate.mnemonic";
enabled: {model.getSelectedSpecies() != null};
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -49,4 +49,4 @@
<JButton id='validateButton' onActionPerformed='handler.validate()'/>
</JPanel>
-</JPanel>
\ No newline at end of file
+</JPanel>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,10 +4,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
@@ -120,4 +118,4 @@
rowsInError.remove(row);
firePropertyChange(PROPERTY_ROWS_IN_ERROR, null, rowsInError);
}
-}
\ No newline at end of file
+}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 - 2013 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicRow.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicRow.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/profiling/META-INF/aop.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/profiling/META-INF/aop.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/profiling/META-INF/aop.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -38,4 +38,4 @@
</aspects>
<!--||execution(* org.springframework..*(..))-->
<!--||execution(* org.hibernate..*(..))-->
-</aspectj>
\ No newline at end of file
+</aspectj>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel-warning-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel-warning-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel-warning-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,18 +5,16 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-edit-warning-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,18 +5,16 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel-validate-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,18 +5,16 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
-
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
You should have received a copy of the GNU General Public
License along with this program. If not, see
<http://www.gnu.org/licenses/gpl-3.0.html>.
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -36,4 +36,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -101,4 +101,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -61,4 +61,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -54,4 +54,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -2,8 +2,10 @@
<!--
#%L
Tutti :: UI
+ $Id$
+ $HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -80,4 +82,4 @@
</field-validator-->
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -75,4 +75,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -100,4 +100,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -61,4 +61,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -54,4 +54,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2012 - 2013 Ifremer
+ Copyright (C) 2012 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as
@@ -50,4 +50,4 @@
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -1,11 +1,8 @@
/*
* #%L
- * ObServe :: Validation
- *
- * $Id$
- * $HeadURL$
+ * Tutti :: UI
* %%
- * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java 2014-05-21 08:25:33 UTC (rev 1801)
@@ -3,10 +3,8 @@
/*
* #%L
* Tutti :: UI
- * $Id$
- * $HeadURL$
* %%
- * Copyright (C) 2012 Ifremer
+ * Copyright (C) 2012 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/test/resources/log4j.properties
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/test/resources/log4j.properties 2014-05-21 07:46:06 UTC (rev 1800)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/test/resources/log4j.properties 2014-05-21 08:25:33 UTC (rev 1801)
@@ -4,7 +4,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2012 Ifremer
+# Copyright (C) 2012 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
1
0
r1800 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic
by tchemit＠users.forge.codelutin.com May 21, 2014
by tchemit＠users.forge.codelutin.com May 21, 2014
May 21, 2014
Author: tchemit
Date: 2014-05-21 09:46:06 +0200 (Wed, 21 May 2014)
New Revision: 1800
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1800
Log:
refs #5110 (report from version 3.4.4)
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.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-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -390,6 +390,11 @@
}
@Override
+ public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) {
+ return referentialService.isHorsVracBatch(speciesBatch);
+ }
+
+ @Override
public Predicate<SpeciesAbleBatch> getVracBatchPredicate() {
return referentialService.getVracBatchPredicate();
}
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2014-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -253,6 +253,11 @@
}
@Override
+ public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) {
+ throw notImplemented();
+ }
+
+ @Override
public Predicate<SpeciesAbleBatch> getVracBatchPredicate() {
throw notImplemented();
}
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2014-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -272,6 +272,8 @@
boolean isVracBatch(SpeciesAbleBatch speciesBatch);
+ boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch);
+
@Cacheable(value = "objectTypeByCode", key = "#objectTypeCode")
ObjectType getObjectType(String objectTypeCode);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -898,6 +898,11 @@
}
@Override
+ public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) {
+ return driver.isHorsVracBatch(speciesBatch);
+ }
+
+ @Override
public Predicate<SpeciesAbleBatch> getVracBatchPredicate() {
return driver.getVracBatchPredicate();
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -118,24 +118,29 @@
String batchWeightUnit = weightMeasuredCaracteristic.getUnit();
for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) {
- CatchExportRow row = new CatchExportRow();
+
+ boolean vracBatch = persistenceService.isVracBatch(speciesBatch);
+
+ CatchExportRow row = new CatchExportRow(vracBatch, false);
row.setCruise(cruise);
row.setFishingOperation(operation);
row.setSpecies(speciesBatch.getSpecies());
row.setBatchWeightUnit(batchWeightUnit);
- if (!persistenceService.isVracBatch(speciesBatch)) {
+ float raisingFactor = speciesCatchRaisingFactor;
+
+ if (!vracBatch) {
+
// for HV, always use a 1.0 raising factor
- speciesCatchRaisingFactor = 1.f;
+ raisingFactor = 1.f;
}
Float batchWeight = TuttiEntities.getValueOrComputedValue(
speciesBatch.getSampleCategoryWeight(),
speciesBatch.getSampleCategoryComputedWeight());
- float totalBatchWeight = batchWeight == null ? 0 : speciesCatchRaisingFactor *
- batchWeight;
+ float totalBatchWeight = batchWeight == null ? 0 : raisingFactor * batchWeight;
addSpeciesBatch(persistenceService,
row,
@@ -145,24 +150,28 @@
}
for (BenthosBatch benthosBatch : rootBenthosBatch.getChildren()) {
- CatchExportRow row = new CatchExportRow();
+
+ boolean vracBatch = persistenceService.isVracBatch(benthosBatch);
+
+ CatchExportRow row = new CatchExportRow(vracBatch, true);
row.setCruise(cruise);
row.setFishingOperation(operation);
row.setSpecies(benthosBatch.getSpecies());
row.setBatchWeightUnit(batchWeightUnit);
- if (!persistenceService.isVracBatch(benthosBatch)) {
+ float raisingFactor = benthosCatchRaisingFactor;
+ if (!vracBatch) {
+
// for HV, always use a 1.0 raising factor
- benthosCatchRaisingFactor = 1.f;
+ raisingFactor = 1.f;
}
Float batchWeight = TuttiEntities.getValueOrComputedValue(
benthosBatch.getSampleCategoryWeight(),
benthosBatch.getSampleCategoryComputedWeight());
- float totalBatchWeight = batchWeight == null ? 0 : benthosCatchRaisingFactor *
- batchWeight;
+ float totalBatchWeight = batchWeight == null ? 0 : raisingFactor * batchWeight;
addBenthosBatch(persistenceService,
row,
@@ -173,21 +182,38 @@
// compute final raising factor
// see http://forge.codelutin.com/issues/4135
+ // see http://forge.codelutin.com/issues/5110
for (CatchExportRow row : rows) {
- float finalRaisingFactor = 1f;
+ float finalRaisingFactor;
+ if (row.isVrac()) {
+
+ finalRaisingFactor = row.isBenthosRow() ? benthosCatchRaisingFactor : speciesCatchRaisingFactor;
+
+ } else {
+
+ finalRaisingFactor = 1f;
+
+ }
+
for (ExportSampleCategory exportSampleCategory : row.getSampleCategory()) {
if (exportSampleCategory != null) {
Float totalWeight = exportSampleCategory.getCategoryWeight();
- Float sampleWeight = exportSampleCategory.getSampleWeight();
+ Float sampleWeight = TuttiEntities.getValueOrComputedValue(
+ exportSampleCategory.getSampleWeight(),
+ exportSampleCategory.getSampleComputedWeight());
if (totalWeight != null && sampleWeight != null) {
- // the only case which can change the final rate
+
float currentRate = totalWeight / sampleWeight;
- finalRaisingFactor *= currentRate;
+ if (TuttiEntities.isNotEqualWeight(1.0f, currentRate)) {
+
+ // the only case which can change the final rate
+ finalRaisingFactor *= currentRate;
+ }
}
}
}
@@ -282,6 +308,10 @@
} else {
+ int categoryIndex = currentRow.getSampleCategory().size();
+
+ float sampleComputedWeight = 0f;
+
for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) {
// always use a copy, otherwise sample categories can be shared by brothers
CatchExportRow childRow = currentRow.copy();
@@ -291,7 +321,15 @@
childBatch,
totalBatchWeight
);
+ ExportSampleCategory exportSampleCategory = childRow.getSampleCategory().get(categoryIndex);
+ if (exportSampleCategory != null) {
+ float categoryWeight = TuttiEntities.getValueOrComputedValue(
+ exportSampleCategory.getCategoryWeight(),
+ exportSampleCategory.getComputedWeight());
+ sampleComputedWeight += categoryWeight;
+ }
}
+ currentRow.getSampleCategory().get(categoryIndex - 1).setSampleComputedWeight(sampleComputedWeight);
}
}
@@ -393,6 +431,10 @@
} else {
+ int categoryIndex = currentRow.getSampleCategory().size();
+
+ float sampleComputedWeight = 0f;
+
for (BenthosBatch childBatch : benthosBatch.getChildBatchs()) {
// always use a copy, otherwise sample categories can be shared by brothers
CatchExportRow childRow = currentRow.copy();
@@ -401,7 +443,13 @@
rows,
childBatch,
totalBatchWeight);
+ ExportSampleCategory exportSampleCategory = childRow.getSampleCategory().get(categoryIndex);
+ float categoryWeight = TuttiEntities.getValueOrComputedValue(
+ exportSampleCategory.getCategoryWeight(),
+ exportSampleCategory.getComputedWeight());
+ sampleComputedWeight += categoryWeight;
}
+ currentRow.getSampleCategory().get(categoryIndex - 1).setSampleComputedWeight(sampleComputedWeight);
}
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -79,6 +79,8 @@
public static final String FINAL_RAISING_FACTOR = "finalRaisingFactor";
+ public static final String BENTHOS_ROW = "benthosRow";
+
protected Cruise cruise;
protected FishingOperation fishingOperation;
@@ -101,8 +103,17 @@
protected String batchWeightUnit;
+ protected final boolean benthosRow;
+
+ protected final boolean vrac;
+
protected final List<String> comment = new ArrayList<>();
+ public CatchExportRow(boolean vrac, boolean benthosRow) {
+ this.vrac = vrac;
+ this.benthosRow = benthosRow;
+ }
+
public void setCruise(Cruise cruise) {
this.cruise = cruise;
}
@@ -219,11 +230,22 @@
this.batchWeightUnit = batchWeightUnit;
}
+ public boolean isVrac() {
+ return vrac;
+ }
+
+ public boolean isHorsVrac() {
+ return !isVrac();
+ }
+
+ public boolean isBenthosRow() {
+ return benthosRow;
+ }
+
public CatchExportRow copy() {
- CatchExportRow result = new CatchExportRow();
+ CatchExportRow result = new CatchExportRow(vrac, benthosRow);
result.setCruise(cruise);
result.setFishingOperation(fishingOperation);
-// result.setSpeciesCategory(speciesCategory);
result.sampleCategory.addAll(sampleCategory);
if (benthosFrequency != null) {
result.setBenthosFrequency(benthosFrequency);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java 2014-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -42,10 +42,6 @@
public static final String PROPERTY_CATEGORY_CARACTERISTIC = "categoryCaracteristic";
- public static final String PROPERTY_CATEGORY_VALUE = "categoryValue";
-
- public static final String PROPERTY_CATEGORY_WEIGHT = "categoryWeight";
-
public static final String PROPERTY_NUMBER = "number";
public static final String PROPERTY_COMPUTED_WEIGHT = "computedWeight";
@@ -64,6 +60,8 @@
private Float sampleWeight;
+ private Float sampleComputedWeight;
+
public String getWeightOrVolType() {
return weightOrVolType;
}
@@ -88,6 +86,14 @@
this.sampleWeight = sampleWeight;
}
+ public Float getSampleComputedWeight() {
+ return sampleComputedWeight;
+ }
+
+ public void setSampleComputedWeight(Float sampleComputedWeight) {
+ this.sampleComputedWeight = sampleComputedWeight;
+ }
+
public Caracteristic getCategoryCaracteristic() {
return categoryDef.getCaracteristic();
}
Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -132,7 +132,7 @@
URL url = new URL(urlPrefix + "species.csv");
ServiceDbResource.assertFileContent("species export:\n",
url,
- "Id;Code_Rubin;Nom Scientifique;Code campagne\n" +
+ "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" +
"380;ACANECH;Acanthocardia echinata;\n" +
"1358;ALOSALO;Alosa alosa;\n" +
"1938;AGONCAT;Agonus cataphractus;\n" +
@@ -192,16 +192,16 @@
ServiceDbResource.assertFileContent("Catch export:\n",
url,
"Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture;Coef_Final_Elevation\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;1.0\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;3.5\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;3.5\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;3.5\n" +
"2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-horsvrac 20;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;1.0;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;4622;;Abietinaria abietina;Trait B-2-1 Benthos ABIEABI Vrac 30@@@@avec @@@@commentaire...;Vrac;101;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;7.0;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;380;;Acanthocardia echinata;Trait B-2-1 Benthos ACANECH Vrac 18@@@@avec @@@@commentaire...;Vrac;102;18.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;18.0;7.0;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-vrac-80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;5.4444447;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;9.074075;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;5.0;1;0.6;cm;1.0;4;0.6;907.4074;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;6.0;2;0.4;cm;1.0;10;0.4;1361.1111;1.0\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;4622;;Abietinaria abietina;Trait B-2-1 Benthos ABIEABI Vrac 30@@@@avec @@@@commentaire...;Vrac;101;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;7.0;7.0\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;380;;Acanthocardia echinata;Trait B-2-1 Benthos ACANECH Vrac 18@@@@avec @@@@commentaire...;Vrac;102;18.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;18.0;7.0;7.0\n" +
+ "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-vrac-80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;5.4444447;5.4444447\n" +
+ "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;9.074075;5.4444447\n" +
+ "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;5.0;1;0.6;cm;1.0;4;0.6;907.4074;5.4444447\n" +
+ "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;6.0;2;0.4;cm;1.0;10;0.4;1361.1111;5.4444447\n" +
"2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-horsvrac-20;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;1.0;1.0\n" +
"2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;0.0;1.0\n" +
"2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;Mâle;2;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;0.0;1.0\n" +
Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-05-21 07:39:03 UTC (rev 1799)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-05-21 07:46:06 UTC (rev 1800)
@@ -100,10 +100,10 @@
public static final String CATCH_CONTENT =
"Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture;Coef_Final_Elevation\n" +
- "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;1;;cm;0.5;5;5.0;20.0;2.0\n" +
- "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;2.0\n" +
- "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;2.0\n" +
- "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;1;;cm;0.5;5;10.0;10.0;1.0\n" +
+ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;1;;cm;0.5;5;5.0;20.0;3.0\n" +
+ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;3.0\n" +
+ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;3.0\n" +
+ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;1;;cm;0.5;5;10.0;10.0;1.5\n" +
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;10.0;1;;cm;;5;30.0;3.3333333;1.6666666\n" +
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;11.0;2;;cm;;6;30.0;3.3333333;1.6666666\n" +
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;12.0;3;;cm;;7;30.0;3.3333333;1.6666666\n" +
@@ -167,13 +167,13 @@
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;100001;3835;Abalistes;;1425;4.0";
public static final String SPECIES_CONTENT =
- "Id;Code_Rubin;Nom Scientifique;Code campagne\n" +
+ "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" +
"3835;ABAL;Abalistes;\n" +
"11242;AAPT;Aaptos;\n" +
"11243;AAPTAAP;Aaptos aaptos;";
public static final String SPECIES_CONTENT_2 =
- "Id;Code_Rubin;Nom Scientifique;Code campagne\n" +
+ "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" +
"300;BUCCUND;Buccinum undatum;\n" +
"365;AEQUOPE;Aequipecten opercularis;\n" +
"489;LOLIVUL;Loligo vulgaris;LOLIVUL\n" +
1
0
r1799 - in branches/tutti-3.4.x: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic
by tchemit＠users.forge.codelutin.com May 21, 2014
by tchemit＠users.forge.codelutin.com May 21, 2014
May 21, 2014
Author: tchemit
Date: 2014-05-21 09:39:03 +0200 (Wed, 21 May 2014)
New Revision: 1799
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1799
Log:
fixes #5110 [EXPORT GENERIQUE] calcul du coef ?\195?\169l?\195?\169vation finale ?\195?\160 corriger
Modified:
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java
branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java
branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -277,6 +277,8 @@
boolean isVracBatch(SpeciesAbleBatch speciesBatch);
+ boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch);
+
boolean isTemporary(TuttiReferentialEntity entity);
List<Gear> getAllScientificGear();
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -437,6 +437,11 @@
}
@Override
+ public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) {
+ return !batchVracPredicate.apply(speciesBatch);
+ }
+
+ @Override
public Predicate<SpeciesAbleBatch> getVracBatchPredicate() {
return batchVracPredicate;
}
Modified: branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java
===================================================================
--- branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -260,6 +260,11 @@
}
@Override
+ public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) {
+ throw notImplemented();
+ }
+
+ @Override
public Predicate<SpeciesAbleBatch> getVracBatchPredicate() {
throw notImplemented();
}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -895,6 +895,11 @@
}
@Override
+ public boolean isHorsVracBatch(SpeciesAbleBatch speciesBatch) {
+ return driver.isHorsVracBatch(speciesBatch);
+ }
+
+ @Override
public Predicate<SpeciesAbleBatch> getVracBatchPredicate() {
return driver.getVracBatchPredicate();
}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -118,24 +118,29 @@
String batchWeightUnit = weightMeasuredCaracteristic.getUnit();
for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) {
- CatchExportRow row = new CatchExportRow();
+
+ boolean vracBatch = persistenceService.isVracBatch(speciesBatch);
+
+ CatchExportRow row = new CatchExportRow(vracBatch, false);
row.setCruise(cruise);
row.setFishingOperation(operation);
row.setSpecies(speciesBatch.getSpecies());
row.setBatchWeightUnit(batchWeightUnit);
- if (!persistenceService.isVracBatch(speciesBatch)) {
+ float raisingFactor = speciesCatchRaisingFactor;
+
+ if (!vracBatch) {
+
// for HV, always use a 1.0 raising factor
- speciesCatchRaisingFactor = 1.f;
+ raisingFactor = 1.f;
}
Float batchWeight = TuttiEntities.getValueOrComputedValue(
speciesBatch.getSampleCategoryWeight(),
speciesBatch.getSampleCategoryComputedWeight());
- float totalBatchWeight = batchWeight == null ? 0 : speciesCatchRaisingFactor *
- batchWeight;
+ float totalBatchWeight = batchWeight == null ? 0 : raisingFactor * batchWeight;
addSpeciesBatch(persistenceService,
row,
@@ -145,24 +150,28 @@
}
for (BenthosBatch benthosBatch : rootBenthosBatch.getChildren()) {
- CatchExportRow row = new CatchExportRow();
+
+ boolean vracBatch = persistenceService.isVracBatch(benthosBatch);
+
+ CatchExportRow row = new CatchExportRow(vracBatch, true);
row.setCruise(cruise);
row.setFishingOperation(operation);
row.setSpecies(benthosBatch.getSpecies());
row.setBatchWeightUnit(batchWeightUnit);
- if (!persistenceService.isVracBatch(benthosBatch)) {
+ float raisingFactor = benthosCatchRaisingFactor;
+ if (!vracBatch) {
+
// for HV, always use a 1.0 raising factor
- benthosCatchRaisingFactor = 1.f;
+ raisingFactor = 1.f;
}
Float batchWeight = TuttiEntities.getValueOrComputedValue(
benthosBatch.getSampleCategoryWeight(),
benthosBatch.getSampleCategoryComputedWeight());
- float totalBatchWeight = batchWeight == null ? 0 : benthosCatchRaisingFactor *
- batchWeight;
+ float totalBatchWeight = batchWeight == null ? 0 : raisingFactor * batchWeight;
addBenthosBatch(persistenceService,
row,
@@ -173,21 +182,38 @@
// compute final raising factor
// see http://forge.codelutin.com/issues/4135
+ // see http://forge.codelutin.com/issues/5110
for (CatchExportRow row : rows) {
- float finalRaisingFactor = 1f;
+ float finalRaisingFactor;
+ if (row.isVrac()) {
+
+ finalRaisingFactor = row.isBenthosRow() ? benthosCatchRaisingFactor : speciesCatchRaisingFactor;
+
+ } else {
+
+ finalRaisingFactor = 1f;
+
+ }
+
for (ExportSampleCategory exportSampleCategory : row.getSampleCategory()) {
if (exportSampleCategory != null) {
Float totalWeight = exportSampleCategory.getCategoryWeight();
- Float sampleWeight = exportSampleCategory.getSampleWeight();
+ Float sampleWeight = TuttiEntities.getValueOrComputedValue(
+ exportSampleCategory.getSampleWeight(),
+ exportSampleCategory.getSampleComputedWeight());
if (totalWeight != null && sampleWeight != null) {
- // the only case which can change the final rate
+
float currentRate = totalWeight / sampleWeight;
- finalRaisingFactor *= currentRate;
+ if (TuttiEntities.isNotEqualWeight(1.0f, currentRate)) {
+
+ // the only case which can change the final rate
+ finalRaisingFactor *= currentRate;
+ }
}
}
}
@@ -282,6 +308,10 @@
} else {
+ int categoryIndex = currentRow.getSampleCategory().size();
+
+ float sampleComputedWeight = 0f;
+
for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) {
// always use a copy, otherwise sample categories can be shared by brothers
CatchExportRow childRow = currentRow.copy();
@@ -291,7 +321,15 @@
childBatch,
totalBatchWeight
);
+ ExportSampleCategory exportSampleCategory = childRow.getSampleCategory().get(categoryIndex);
+ if (exportSampleCategory != null) {
+ float categoryWeight = TuttiEntities.getValueOrComputedValue(
+ exportSampleCategory.getCategoryWeight(),
+ exportSampleCategory.getComputedWeight());
+ sampleComputedWeight += categoryWeight;
+ }
}
+ currentRow.getSampleCategory().get(categoryIndex - 1).setSampleComputedWeight(sampleComputedWeight);
}
}
@@ -393,6 +431,10 @@
} else {
+ int categoryIndex = currentRow.getSampleCategory().size();
+
+ float sampleComputedWeight = 0f;
+
for (BenthosBatch childBatch : benthosBatch.getChildBatchs()) {
// always use a copy, otherwise sample categories can be shared by brothers
CatchExportRow childRow = currentRow.copy();
@@ -401,7 +443,13 @@
rows,
childBatch,
totalBatchWeight);
+ ExportSampleCategory exportSampleCategory = childRow.getSampleCategory().get(categoryIndex);
+ float categoryWeight = TuttiEntities.getValueOrComputedValue(
+ exportSampleCategory.getCategoryWeight(),
+ exportSampleCategory.getComputedWeight());
+ sampleComputedWeight += categoryWeight;
}
+ currentRow.getSampleCategory().get(categoryIndex - 1).setSampleComputedWeight(sampleComputedWeight);
}
}
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportRow.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -78,6 +78,8 @@
public static final String FINAL_RAISING_FACTOR = "finalRaisingFactor";
+ public static final String BENTHOS_ROW = "benthosRow";
+
protected Cruise cruise;
protected FishingOperation fishingOperation;
@@ -100,8 +102,17 @@
protected String batchWeightUnit;
+ protected final boolean benthosRow;
+
+ protected final boolean vrac;
+
protected final List<String> comment = new ArrayList<>();
+ public CatchExportRow(boolean vrac, boolean benthosRow) {
+ this.vrac = vrac;
+ this.benthosRow = benthosRow;
+ }
+
public void setCruise(Cruise cruise) {
this.cruise = cruise;
}
@@ -218,11 +229,22 @@
this.batchWeightUnit = batchWeightUnit;
}
+ public boolean isVrac() {
+ return vrac;
+ }
+
+ public boolean isHorsVrac() {
+ return !isVrac();
+ }
+
+ public boolean isBenthosRow() {
+ return benthosRow;
+ }
+
public CatchExportRow copy() {
- CatchExportRow result = new CatchExportRow();
+ CatchExportRow result = new CatchExportRow(vrac, benthosRow);
result.setCruise(cruise);
result.setFishingOperation(fishingOperation);
-// result.setSpeciesCategory(speciesCategory);
result.sampleCategory.addAll(sampleCategory);
if (benthosFrequency != null) {
result.setBenthosFrequency(benthosFrequency);
Modified: branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/ExportSampleCategory.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -42,10 +42,6 @@
public static final String PROPERTY_CATEGORY_CARACTERISTIC = "categoryCaracteristic";
- public static final String PROPERTY_CATEGORY_VALUE = "categoryValue";
-
- public static final String PROPERTY_CATEGORY_WEIGHT = "categoryWeight";
-
public static final String PROPERTY_NUMBER = "number";
public static final String PROPERTY_COMPUTED_WEIGHT = "computedWeight";
@@ -64,6 +60,8 @@
private Float sampleWeight;
+ private Float sampleComputedWeight;
+
public String getWeightOrVolType() {
return weightOrVolType;
}
@@ -88,6 +86,14 @@
this.sampleWeight = sampleWeight;
}
+ public Float getSampleComputedWeight() {
+ return sampleComputedWeight;
+ }
+
+ public void setSampleComputedWeight(Float sampleComputedWeight) {
+ this.sampleComputedWeight = sampleComputedWeight;
+ }
+
public Caracteristic getCategoryCaracteristic() {
return categoryDef.getCaracteristic();
}
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -132,7 +132,7 @@
URL url = new URL(urlPrefix + "species.csv");
ServiceDbResource.assertFileContent("species export:\n",
url,
- "Id;Code_Rubin;Nom Scientifique;Code campagne\n" +
+ "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" +
"380;ACANECH;Acanthocardia echinata;\n" +
"1358;ALOSALO;Alosa alosa;\n" +
"1938;AGONCAT;Agonus cataphractus;\n" +
@@ -192,16 +192,16 @@
ServiceDbResource.assertFileContent("Catch export:\n",
url,
"Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture;Coef_Final_Elevation\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;1.0\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-vrac 80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;3.5;3.5\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;5.8333335;3.5\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;1358;;Alosa alosa;Trait B-2-1 ALOSALO Vrac|Trait B-2-1 ALOSALO Vrac - Femelle 40.0;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;40.0;8.75;3.5\n" +
"2013;test elevation;1;OTB 20/28.10;B;2;1;1938;;Agonus cataphractus;Trait B-2-1 AGONCAT-horsvrac 20;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;1.0;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;4622;;Abietinaria abietina;Trait B-2-1 Benthos ABIEABI Vrac 30@@@@avec @@@@commentaire...;Vrac;101;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;7.0;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;B;2;1;380;;Acanthocardia echinata;Trait B-2-1 Benthos ACANECH Vrac 18@@@@avec @@@@commentaire...;Vrac;102;18.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;18.0;7.0;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-vrac-80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;5.4444447;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;9.074075;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;5.0;1;0.6;cm;1.0;4;0.6;907.4074;1.0\n" +
- "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;6.0;2;0.4;cm;1.0;10;0.4;1361.1111;1.0\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;4622;;Abietinaria abietina;Trait B-2-1 Benthos ABIEABI Vrac 30@@@@avec @@@@commentaire...;Vrac;101;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;7.0;7.0\n" +
+ "2013;test elevation;1;OTB 20/28.10;B;2;1;380;;Acanthocardia echinata;Trait B-2-1 Benthos ACANECH Vrac 18@@@@avec @@@@commentaire...;Vrac;102;18.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;18.0;7.0;7.0\n" +
+ "2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-vrac-80;Vrac;1;80.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;80.0;5.4444447;5.4444447\n" +
+ "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-male 60;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;60.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;60.0;9.074075;5.4444447\n" +
+ "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;5.0;1;0.6;cm;1.0;4;0.6;907.4074;5.4444447\n" +
+ "2013;test elevation;1;OTB 20/28.10;A;1;1;1358;;Alosa alosa;ALOSALO-vrac|ALOSALO-vrac-femelle 40;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;40.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;306;Longueur totale (LT) - individu - totale - Mesure au cm par un observateur;6.0;2;0.4;cm;1.0;10;0.4;1361.1111;5.4444447\n" +
"2013;test elevation;1;OTB 20/28.10;A;1;1;1938;;Agonus cataphractus;AGONCAT-horsvrac-20;Hors Vrac;1;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;1.0;1.0\n" +
"2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;30.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;30.0;0.0;1.0\n" +
"2013;test elevation;1;;C;3;1;11183;;Brissopsis atlantica;|;Vrac;1;;;Poids;kg;NA;;;;;kg;Mâle;2;20.0;;Poids;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;20.0;0.0;1.0\n" +
Modified: branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java
===================================================================
--- branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-05-20 14:47:17 UTC (rev 1798)
+++ branches/tutti-3.4.x/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceTest.java 2014-05-21 07:39:03 UTC (rev 1799)
@@ -100,10 +100,10 @@
public static final String CATCH_CONTENT =
"Annee;Serie;Serie_Partielle;Engin;Code_station;Id_Operation;Poche;Code_Taxon;Code_Espece_Campagne;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri;Num_Ordre_Class_Tri_H2;Tot_Class_Tri;Ech_Class_Tri;Type_Volume_Poids_Class_Tri;Unite_Volume_Poids_Class_Tri;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturite;Num_Ordre_Maturite_H2;Tot_Maturite;Ech_Maturite;Type_Volume_Poids_Maturite;Unite_Volume_Poids_Maturite;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture;Coef_Final_Elevation\n" +
- "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;1;;cm;0.5;5;5.0;20.0;2.0\n" +
- "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;2.0\n" +
- "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;2.0\n" +
- "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;1;;cm;0.5;5;10.0;10.0;1.0\n" +
+ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;1;;cm;0.5;5;5.0;20.0;3.0\n" +
+ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;5.0;20.0;3.0\n" +
+ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;1 - Stade 1;1;10.0;5.0;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;3;;cm;0.5;1;5.0;20.0;3.0\n" +
+ "2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;|||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Mâle;1;30.0;;Poids;kg;3 - Stade 3;3;10.0;;Poids;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;1;;cm;0.5;5;10.0;10.0;1.5\n" +
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;10.0;1;;cm;;5;30.0;3.3333333;1.6666666\n" +
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;11.0;2;;cm;;6;30.0;3.3333333;1.6666666\n" +
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;11242;;Aaptos;||;Vrac;1;100.0;;Poids;kg;G - Gros;1;80.0;;Poids;kg;Femelle;2;50.0;30.0;Poids;kg;NA;;;;;kg;NA;;;;;kg;1425;Longueur totale (LT) - individu - queue - Mesure au cm par un observateur;12.0;3;;cm;;7;30.0;3.3333333;1.6666666\n" +
@@ -167,13 +167,13 @@
"2013;Campagne CGFS;;GOV 19.7/25.9;A;1;1;100001;3835;Abalistes;;1425;4.0";
public static final String SPECIES_CONTENT =
- "Id;Code_Rubin;Nom Scientifique;Code campagne\n" +
+ "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" +
"3835;ABAL;Abalistes;\n" +
"11242;AAPT;Aaptos;\n" +
"11243;AAPTAAP;Aaptos aaptos;";
public static final String SPECIES_CONTENT_2 =
- "Id;Code_Rubin;Nom Scientifique;Code campagne\n" +
+ "Id;Code_Rubin;Nom_scientifique;Code_campagne\n" +
"300;BUCCUND;Buccinum undatum;\n" +
"365;AEQUOPE;Aequipecten opercularis;\n" +
"489;LOLIVUL;Loligo vulgaris;LOLIVUL\n" +
1
0
r1798 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/action resources/i18n
by tchemit＠users.forge.codelutin.com May 20, 2014
by tchemit＠users.forge.codelutin.com May 20, 2014
May 20, 2014
Author: tchemit
Date: 2014-05-20 16:47:17 +0200 (Tue, 20 May 2014)
New Revision: 1798
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1798
Log:
refs #5115 (report from version 3.4.4)
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java
trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties
trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:46:49 UTC (rev 1797)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:47:17 UTC (rev 1798)
@@ -68,10 +68,9 @@
if (!getDataContext().isProtocolFilled()) {
displayWarningMessage(
- t("tutti.exportCruiseForSumatra.title.required.protocol"),
- t("tutti.exportCruiseForSumatra.message.required.protocol")
+ t("tutti.exportCruiseForSumatra.title.missing.protocol"),
+ t("tutti.exportCruiseForSumatra.message.missing.protocol")
);
- doAction = false;
}
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-05-20 14:46:49 UTC (rev 1797)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-05-20 14:47:17 UTC (rev 1798)
@@ -80,10 +80,9 @@
if (!getDataContext().isProtocolFilled()) {
displayWarningMessage(
- t("tutti.exportFishingOperationForSumatra.title.required.protocol"),
- t("tutti.exportFishingOperationForSumatra.message.required.protocol")
+ t("tutti.exportFishingOperationForSumatra.title.missing.protocol"),
+ t("tutti.exportFishingOperationForSumatra.message.missing.protocol")
);
- doAction = false;
}
}
Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-05-20 14:46:49 UTC (rev 1797)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-05-20 14:47:17 UTC (rev 1798)
@@ -1132,7 +1132,11 @@
tutti.exportCruise.action.success=
tutti.exportCruiseForSumatra.action.chooseFile=
tutti.exportCruiseForSumatra.action.success=
+tutti.exportCruiseForSumatra.message.missing.protocol=
+tutti.exportCruiseForSumatra.message.required.protocol=
tutti.exportCruiseForSumatra.title.choose.exportFile=
+tutti.exportCruiseForSumatra.title.missing.protocol=
+tutti.exportCruiseForSumatra.title.required.protocol=
tutti.exportCruiseForSumatraV2.action.chooseFile=
tutti.exportCruiseForSumatraV2.action.success=
tutti.exportCruiseForSumatraV2.message.required.protocol=
@@ -1146,11 +1150,13 @@
tutti.exportFishingOperationForSumatra.action.success=
tutti.exportFishingOperationForSumatra.message.badBenthos=
tutti.exportFishingOperationForSumatra.message.badSpecies=
+tutti.exportFishingOperationForSumatra.message.missing.protocol=
tutti.exportFishingOperationForSumatra.message.model.modified=Catch was modified, please save it before launching an export.
tutti.exportFishingOperationForSumatra.message.required.protocol=
tutti.exportFishingOperationForSumatra.title.badBenthos=
tutti.exportFishingOperationForSumatra.title.badSpecies=
tutti.exportFishingOperationForSumatra.title.choose.exportFile=
+tutti.exportFishingOperationForSumatra.title.missing.protocol=
tutti.exportFishingOperationForSumatra.title.model.modified=Can't export, catch is modified
tutti.exportFishingOperationForSumatra.title.required.protocol=
tutti.exportFishingOperationForSumatraV2.action.chooseFile=
Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-05-20 14:46:49 UTC (rev 1797)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-05-20 14:47:17 UTC (rev 1798)
@@ -1116,9 +1116,9 @@
tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>.
tutti.exportCruiseForSumatra.action.chooseFile=Choisir le fichier d'export
tutti.exportCruiseForSumatra.action.success=La campagne sélectionnée a été exportée dans le fichier <strong>%s</strong>
-tutti.exportCruiseForSumatra.message.required.protocol=Pour faire un export csv, un protocol est requis.<br/>De plus toutes les espèces de la captures doivent être renseignées dans le protocole.
+tutti.exportCruiseForSumatra.message.missing.protocol=<html><body>Pas de protocole renseigné, La colonne <strong>espcecamapgne</strong> ne sera pas renseigné.</body></html>
tutti.exportCruiseForSumatra.title.choose.exportFile=Exporter la campagne
-tutti.exportCruiseForSumatra.title.required.protocol=Protocole requis pour export csv
+tutti.exportCruiseForSumatra.title.missing.protocol=Pas de protocole renseigné
tutti.exportCruiseForSumatraV2.message.required.protocol=
tutti.exportCruiseForSumatraV2.title.required.protocol=
tutti.exportDb.step.closeDb=Fermeture de la base courante
@@ -1129,11 +1129,13 @@
tutti.exportFishingOperationForSumatra.action.success=Le trait a été exporté dans le fichier <strong>%s</strong>
tutti.exportFishingOperationForSumatra.message.badBenthos=<html><body>Des espèces non présentes (ou avec un code campagne non renseigné) dans le protocole (onglet Benthos) ont été détectées \: <ul>%s</ul></body></html>
tutti.exportFishingOperationForSumatra.message.badSpecies=<html><body>Des espèces non présentes (ou avec un code campagne non renseigné) dans le protocole (onglet Espèce) ont été détectées \: <ul>%s</ul></body></html>
+tutti.exportFishingOperationForSumatra.message.missing.protocol=
tutti.exportFishingOperationForSumatra.message.model.modified=La capture a été modifiée, veuillez l'enregistrer avant de lancer un export.
tutti.exportFishingOperationForSumatra.message.required.protocol=<html><body>Pour faire un export csv, un protocol est requis.<br/>De plus toutes les espèces de la captures doivent être renseignées dans le protocole.</body></html>
tutti.exportFishingOperationForSumatra.title.badBenthos=Espèces non présentes dans le protocole (onglet Benthos)
tutti.exportFishingOperationForSumatra.title.badSpecies=Espèces non présentes dans le protocole (onglet Espèce)
tutti.exportFishingOperationForSumatra.title.choose.exportFile=Exporter le trait de la campagne
+tutti.exportFishingOperationForSumatra.title.missing.protocol=
tutti.exportFishingOperationForSumatra.title.model.modified=Impossible d'exporter, capture modifiée
tutti.exportFishingOperationForSumatra.title.required.protocol=Protocole requis pour export csv
tutti.exportFishingOperationReport.action.chooseFile=Choisir le fichier de rapport
1
0
r1797 - in branches/tutti-3.4.x/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/action resources/i18n
by tchemit＠users.forge.codelutin.com May 20, 2014
by tchemit＠users.forge.codelutin.com May 20, 2014
May 20, 2014
Author: tchemit
Date: 2014-05-20 16:46:49 +0200 (Tue, 20 May 2014)
New Revision: 1797
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1797
Log:
fixes #5115 [EXPORT] Evolution format export SUMATRA pelgas
Modified:
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties
branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:38:18 UTC (rev 1796)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:46:49 UTC (rev 1797)
@@ -68,10 +68,9 @@
if (!getDataContext().isProtocolFilled()) {
displayWarningMessage(
- t("tutti.exportCruiseForSumatra.title.required.protocol"),
- t("tutti.exportCruiseForSumatra.message.required.protocol")
+ t("tutti.exportCruiseForSumatra.title.missing.protocol"),
+ t("tutti.exportCruiseForSumatra.message.missing.protocol")
);
- doAction = false;
}
}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-05-20 14:38:18 UTC (rev 1796)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-05-20 14:46:49 UTC (rev 1797)
@@ -80,10 +80,9 @@
if (!getDataContext().isProtocolFilled()) {
displayWarningMessage(
- t("tutti.exportFishingOperationForSumatra.title.required.protocol"),
- t("tutti.exportFishingOperationForSumatra.message.required.protocol")
+ t("tutti.exportFishingOperationForSumatra.title.missing.protocol"),
+ t("tutti.exportFishingOperationForSumatra.message.missing.protocol")
);
- doAction = false;
}
}
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-05-20 14:38:18 UTC (rev 1796)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-05-20 14:46:49 UTC (rev 1797)
@@ -1130,7 +1130,11 @@
tutti.exportCruise.action.success=
tutti.exportCruiseForSumatra.action.chooseFile=
tutti.exportCruiseForSumatra.action.success=
+tutti.exportCruiseForSumatra.message.missing.protocol=
+tutti.exportCruiseForSumatra.message.required.protocol=
tutti.exportCruiseForSumatra.title.choose.exportFile=
+tutti.exportCruiseForSumatra.title.missing.protocol=
+tutti.exportCruiseForSumatra.title.required.protocol=
tutti.exportCruiseForSumatraV2.action.chooseFile=
tutti.exportCruiseForSumatraV2.action.success=
tutti.exportCruiseForSumatraV2.message.required.protocol=
@@ -1144,11 +1148,13 @@
tutti.exportFishingOperationForSumatra.action.success=
tutti.exportFishingOperationForSumatra.message.badBenthos=
tutti.exportFishingOperationForSumatra.message.badSpecies=
+tutti.exportFishingOperationForSumatra.message.missing.protocol=
tutti.exportFishingOperationForSumatra.message.model.modified=Catch was modified, please save it before launching an export.
tutti.exportFishingOperationForSumatra.message.required.protocol=
tutti.exportFishingOperationForSumatra.title.badBenthos=
tutti.exportFishingOperationForSumatra.title.badSpecies=
tutti.exportFishingOperationForSumatra.title.choose.exportFile=
+tutti.exportFishingOperationForSumatra.title.missing.protocol=
tutti.exportFishingOperationForSumatra.title.model.modified=Can't export, catch is modified
tutti.exportFishingOperationForSumatra.title.required.protocol=
tutti.exportFishingOperationForSumatraV2.action.chooseFile=
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-05-20 14:38:18 UTC (rev 1796)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-05-20 14:46:49 UTC (rev 1797)
@@ -1114,9 +1114,9 @@
tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>.
tutti.exportCruiseForSumatra.action.chooseFile=Choisir le fichier d'export
tutti.exportCruiseForSumatra.action.success=La campagne sélectionnée a été exportée dans le fichier <strong>%s</strong>
-tutti.exportCruiseForSumatra.message.required.protocol=Pour faire un export csv, un protocol est requis.<br/>De plus toutes les espèces de la captures doivent être renseignées dans le protocole.
+tutti.exportCruiseForSumatra.message.missing.protocol=<html><body>Pas de protocole renseigné, La colonne <strong>espcecamapgne</strong> ne sera pas renseigné.</body></html>
tutti.exportCruiseForSumatra.title.choose.exportFile=Exporter la campagne
-tutti.exportCruiseForSumatra.title.required.protocol=Protocole requis pour export csv
+tutti.exportCruiseForSumatra.title.missing.protocol=Pas de protocole renseigné
tutti.exportCruiseForSumatraV2.message.required.protocol=
tutti.exportCruiseForSumatraV2.title.required.protocol=
tutti.exportDb.step.closeDb=Fermeture de la base courante
@@ -1127,11 +1127,13 @@
tutti.exportFishingOperationForSumatra.action.success=Le trait a été exporté dans le fichier <strong>%s</strong>
tutti.exportFishingOperationForSumatra.message.badBenthos=<html><body>Des espèces non présentes (ou avec un code campagne non renseigné) dans le protocole (onglet Benthos) ont été détectées \: <ul>%s</ul></body></html>
tutti.exportFishingOperationForSumatra.message.badSpecies=<html><body>Des espèces non présentes (ou avec un code campagne non renseigné) dans le protocole (onglet Espèce) ont été détectées \: <ul>%s</ul></body></html>
+tutti.exportFishingOperationForSumatra.message.missing.protocol=
tutti.exportFishingOperationForSumatra.message.model.modified=La capture a été modifiée, veuillez l'enregistrer avant de lancer un export.
tutti.exportFishingOperationForSumatra.message.required.protocol=<html><body>Pour faire un export csv, un protocol est requis.<br/>De plus toutes les espèces de la captures doivent être renseignées dans le protocole.</body></html>
tutti.exportFishingOperationForSumatra.title.badBenthos=Espèces non présentes dans le protocole (onglet Benthos)
tutti.exportFishingOperationForSumatra.title.badSpecies=Espèces non présentes dans le protocole (onglet Espèce)
tutti.exportFishingOperationForSumatra.title.choose.exportFile=Exporter le trait de la campagne
+tutti.exportFishingOperationForSumatra.title.missing.protocol=
tutti.exportFishingOperationForSumatra.title.model.modified=Impossible d'exporter, capture modifiée
tutti.exportFishingOperationForSumatra.title.required.protocol=Protocole requis pour export csv
tutti.exportFishingOperationReport.action.chooseFile=Choisir le fichier de rapport
1
0
r1796 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action
by tchemit＠users.forge.codelutin.com May 20, 2014
by tchemit＠users.forge.codelutin.com May 20, 2014
May 20, 2014
Author: tchemit
Date: 2014-05-20 16:38:18 +0200 (Tue, 20 May 2014)
New Revision: 1796
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1796
Log:
refs #5115 (report from version 3.4.4)
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:37:25 UTC (rev 1795)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:38:18 UTC (rev 1796)
@@ -68,8 +68,8 @@
if (!getDataContext().isProtocolFilled()) {
displayWarningMessage(
- t("tutti.exportCruiseForSumatraV2.title.required.protocol"),
- t("tutti.exportCruiseForSumatraV2.message.required.protocol")
+ t("tutti.exportCruiseForSumatra.title.required.protocol"),
+ t("tutti.exportCruiseForSumatra.message.required.protocol")
);
doAction = false;
}
1
0
r1795 - branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action
by tchemit＠users.forge.codelutin.com May 20, 2014
by tchemit＠users.forge.codelutin.com May 20, 2014
May 20, 2014
Author: tchemit
Date: 2014-05-20 16:37:25 +0200 (Tue, 20 May 2014)
New Revision: 1795
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1795
Log:
fixes #5115 [EXPORT] Evolution format export SUMATRA pelgas
Modified:
branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
===================================================================
--- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:35:51 UTC (rev 1794)
+++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:37:25 UTC (rev 1795)
@@ -68,8 +68,8 @@
if (!getDataContext().isProtocolFilled()) {
displayWarningMessage(
- t("tutti.exportCruiseForSumatraV2.title.required.protocol"),
- t("tutti.exportCruiseForSumatraV2.message.required.protocol")
+ t("tutti.exportCruiseForSumatra.title.required.protocol"),
+ t("tutti.exportCruiseForSumatra.message.required.protocol")
);
doAction = false;
}
1
0
r1794 - in trunk: src/conception/specifications src/site/rst tutti-ui-swing/src/main/help/fr
by lkaufmann＠users.forge.codelutin.com May 20, 2014
by lkaufmann＠users.forge.codelutin.com May 20, 2014
May 20, 2014
Author: lkaufmann
Date: 2014-05-20 16:35:51 +0200 (Tue, 20 May 2014)
New Revision: 1794
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1794
Log:
Fixes #5089 Specifications : add last evolutions & referential queries
Modified:
trunk/src/conception/specifications/AllegroCampagne-Specifications.odt
trunk/src/conception/specifications/AllegroCampagne-Specifications.pdf
trunk/src/site/rst/referential.rst
trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html
Modified: trunk/src/conception/specifications/AllegroCampagne-Specifications.odt
===================================================================
(Binary files differ)
Modified: trunk/src/conception/specifications/AllegroCampagne-Specifications.pdf
===================================================================
(Binary files differ)
Modified: trunk/src/site/rst/referential.rst
===================================================================
--- trunk/src/site/rst/referential.rst 2014-05-20 14:35:16 UTC (rev 1793)
+++ trunk/src/site/rst/referential.rst 2014-05-20 14:35:51 UTC (rev 1794)
@@ -31,7 +31,7 @@
Ce document décrit comment sont récupérées les données du référentiel.
-Chaque requète a un nom du style **[REF-XXX]**.
+Chaque requête a un nom du style **[REF-XXX]**.
Les requètes métier
~~~~~~~~~~~~~~~~~~~
@@ -161,6 +161,7 @@
-------------------------------
::
+
SELECT DISTINCT
p.id,
p.lastname,
@@ -173,9 +174,9 @@
WHERE
p.status.code IN (:statusValidCode, :statusTemporaryCode)
AND pp.id IN (
- :observerProfilId,
- :projectMemberProfilId,
- :userProfilId
+ :observerProfilId,
+ :projectMemberProfilId,
+ :userProfilId
)
AND p.department.code LIKE concat(:departementPrefixCode , '%')
@@ -190,42 +191,42 @@
*État:* Valide.
-[REF-05] Catégorie de macro-déchets
+[REF-06] Catégorie de macro-déchets
-----------------------------------
[REF-T01] + [REF-T02] avec :pmfmId = *PmfmId.MARINE_LITTER_TYPE*
*État:* Valide.
-[REF-06] Catégorie de taille macro-déchets
+[REF-07] Catégorie de taille macro-déchets
-------------------------------------------
[REF-T01] + [REF-T02] avec :pmfmId = *PmfmId.MARINE_LITTER_SIZE_CATEGORY*
*État:* Valide.
-[REF-07] Catégorie H/VC
+[REF-08] Catégorie H/VC
-----------------------
[REF-T01] + [REF-T02] avec :pmfmId = *PmfmId.SORTED_UNSORTED*
*État:* Valide.
-[REF-08] Catégorie Classe. Tri
+[REF-09] Catégorie Classe. Tri
------------------------------
[REF-T01] + [REF-T02] avec :pmfmId = *PmfmId.SIZE_CATEGORY*
*État:* Valide.
-[REF-09] Catégorie Sexe
+[REF-10] Catégorie Sexe
-----------------------
[REF-T01] + [REF-T02] avec :pmfmId = *PmfmId.SEX*
*État:* Valide.
-[REF-10] Catégorie Maturité
+[REF-11] Catégorie Maturité
---------------------------
[REF-T01] + [REF-T02] avec :pmfmId = *PmfmId.MATURITY*
@@ -273,7 +274,7 @@
*État:* Valide.
-Les requètes techniques
+Les requêtes techniques
~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------------------------------------+-------+-----------------------------------------------------+
Modified: trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html
===================================================================
--- trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html 2014-05-20 14:35:16 UTC (rev 1793)
+++ trunk/tutti-ui-swing/src/main/help/fr/dbMapping.html 2014-05-20 14:35:51 UTC (rev 1794)
@@ -220,12 +220,21 @@
<td>
<p>Date (JJ/MM/AAAA)</p>
</td>
- <td colspan="2">
+ <td colspan="2" rowspan="2">
<p>ScientificCruise.departureDateTime (SCIENTIFIC_CRUISE.DEPARTURE_DATE_TIME)</p>
</td>
</tr>
<tr>
+ <td>Heure de début</td>
<td>
+ <p class="checked">X</p>
+ </td>
+ <td>
+ Heure (HH:MM)
+ </td>
+ </tr>
+ <tr>
+ <td>
<p>Date de fin</p>
</td>
<td>
@@ -234,12 +243,21 @@
<td>
<p>Date (JJ/MM/AAAA)</p>
</td>
- <td colspan="2">
+ <td colspan="2" rowspan="2">
<p>ScientificCruise.returnDateTime (SCIENTIFIC_CRUISE.RETURN_DATE_TIME)</p>
</td>
</tr>
<tr>
+ <td>Heure de fin</td>
<td>
+ <p class="checked">X</p>
+ </td>
+ <td>
+ Heure (HH:MM)
+ </td>
+ </tr>
+ <tr>
+ <td>
<p>Navire</p>
</td>
<td>
1
0
May 20, 2014
Author: tchemit
Date: 2014-05-20 16:35:16 +0200 (Tue, 20 May 2014)
New Revision: 1793
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1793
Log:
refs #5115 (report from version 3.4.4)
Added:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java
Removed:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModelV2.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowV2.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceV2.java
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceV2Test.java
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/ExportFishingOperationForSumatraV2Action.java
Modified:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java
trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties
trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties
trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -74,7 +74,6 @@
import org.apache.commons.vfs2.FileType;
import org.nuiton.jaxx.application.ApplicationBusinessException;
import org.nuiton.jaxx.application.ApplicationIOUtil;
-import org.nuiton.jaxx.application.ApplicationTechnicalException;
import org.nuiton.util.TimeLog;
import org.nuiton.util.Version;
@@ -84,9 +83,11 @@
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import java.util.concurrent.Callable;
import static org.nuiton.i18n.I18n.t;
@@ -601,10 +602,12 @@
return null;
}
- public void fillSpeciesSurveyCode(Collection<Species> speciesList) {
+ public Set<String> fillSpeciesSurveyCode(Collection<Species> speciesList) {
TuttiProtocol protocol = getProtocol();
+ Set<String> badSpecies = new LinkedHashSet<>();
+
if (protocol != null) {
// fill available species from protocol
if (!protocol.isSpeciesEmpty()) {
@@ -615,19 +618,26 @@
SpeciesProtocol speciesProtocol = protocolMap.get(species.getReferenceTaxonId());
if (speciesProtocol == null ||
StringUtils.isEmpty(speciesProtocol.getSpeciesSurveyCode())) {
- throw new ApplicationTechnicalException(t("tutti.error.species.not.in.protocol", species.getName()));
+ badSpecies.add(species.getName());
+ continue;
}
species.setSurveyCode(speciesProtocol.getSpeciesSurveyCode());
}
}
}
+
+ return badSpecies;
}
- public void fillBenthosSurveyCode(Collection<Species> benthosList) {
+ public Set<String> fillBenthosSurveyCode(Collection<Species> benthosList) {
TuttiProtocol protocol = getProtocol();
+ Set<String> badSpecies = new LinkedHashSet<>();
+
if (protocol != null) {
+
+
// fill available benthos from protocol
if (!protocol.isBenthosEmpty()) {
@@ -637,12 +647,15 @@
SpeciesProtocol speciesProtocol = protocolMap.get(species.getReferenceTaxonId());
if (speciesProtocol == null ||
StringUtils.isEmpty(speciesProtocol.getSpeciesSurveyCode())) {
- throw new ApplicationTechnicalException(t("tutti.error.benthos.not.in.protocol", species.getName()));
+ badSpecies.add(species.getName());
+ continue;
}
species.setSurveyCode(speciesProtocol.getSpeciesSurveyCode());
}
}
}
+
+ return badSpecies;
}
public static final TimeLog TIME_LOG = new TimeLog(PersistenceService.class);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -153,18 +153,12 @@
}
};
- public static final ValueFormatter<Number> NUMBER_OR_NA = new ValueFormatter<Number>() {
- @Override
- public String format(Number s) {
- return s == null ? "NA" : s.toString();
- }
- };
-
public static final ValueFormatter<Species> SPECIES_SURVEY_CODE_FORMATTER = new ValueFormatter<Species>() {
@Override
public String format(Species s) {
Preconditions.checkNotNull(s, t("tutti.service.error.species.null"));
- return s.getSurveyCode();
+ String surveyCode = s.getSurveyCode();
+ return surveyCode == null ? "" : surveyCode;
}
};
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -28,6 +28,7 @@
import fr.ifremer.tutti.persistence.entities.referential.Species;
import java.io.Serializable;
+import java.util.Date;
/**
* @author kmorin <kmorin(a)codelutin.com>
@@ -37,26 +38,82 @@
private static final long serialVersionUID = 1L;
- public static final String PROPERTY_FISHING_OPERATION = "fishingOperation";
+ public static final String PROPERTY_STATION_NUMBER = FishingOperation.PROPERTY_STATION_NUMBER;
+ public static final String PROPERTY_GEAR_SHOOTING_START_DATE = FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE;
+
+ public static final String PROPERTY_MULTIRIG_AGGREGATION = FishingOperation.PROPERTY_MULTIRIG_AGGREGATION;
+
+ public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE = FishingOperation.PROPERTY_GEAR_SHOOTING_START_LATITUDE;
+
+ public static final String PROPERTY_GEAR_SHOOTING_END_LATITUDE = FishingOperation.PROPERTY_GEAR_SHOOTING_END_LATITUDE;
+
+ public static final String PROPERTY_GEAR_SHOOTING_START_LONGITUDE = FishingOperation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE;
+
+ public static final String PROPERTY_GEAR_SHOOTING_END_LONGITUDE = FishingOperation.PROPERTY_GEAR_SHOOTING_END_LONGITUDE;
+
public static final String PROPERTY_SPECIES = "species";
- public static final String PROPERTY_WEIGHT = "weight";
+ public static final String PROPERTY_SIGN = "sign";
+ public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight";
+
+ public static final String PROPERTY_SORTED_WEIGHT = "sortedWeight";
+
+ public static final String PROPERTY_AVERAGE_WEIGHT = "averageWeight";
+
+ public static final String PROPERTY_AVERAGE_SIZE = "averageSize";
+
public static final String PROPERTY_NUMBER = "number";
+ public static final String PROPERTY_MOULE = "moule";
+
protected FishingOperation fishingOperation;
protected Species species;
- protected Float weight;
+ protected String sign;
+ protected Float totalWeight;
+
+ protected Float sortedWeight;
+
+ protected Float averageWeight;
+
+ protected Float averageSize;
+
protected Integer number;
- public FishingOperation getFishingOperation() {
- return fishingOperation;
+ protected Float moule;
+
+ public String getStationNumber() {
+ return fishingOperation.getStationNumber();
}
+ public Date getGearShootingStartDate() {
+ return fishingOperation.getGearShootingStartDate();
+ }
+
+ public String getMultirigAggregation() {
+ return fishingOperation.getMultirigAggregation();
+ }
+
+ public Float getGearShootingStartLatitude() {
+ return fishingOperation.getGearShootingStartLatitude();
+ }
+
+ public Float getGearShootingStartLongitude() {
+ return fishingOperation.getGearShootingStartLongitude();
+ }
+
+ public Float getGearShootingEndLatitude() {
+ return fishingOperation.getGearShootingEndLatitude();
+ }
+
+ public Float getGearShootingEndLongitude() {
+ return fishingOperation.getGearShootingEndLongitude();
+ }
+
public void setFishingOperation(FishingOperation fishingOperation) {
this.fishingOperation = fishingOperation;
}
@@ -69,14 +126,46 @@
this.species = species;
}
- public Float getWeight() {
- return weight;
+ public String getSign() {
+ return sign;
}
- public void setWeight(Float weight) {
- this.weight = weight;
+ public void setSign(String sign) {
+ this.sign = sign;
}
+ public Float getTotalWeight() {
+ return totalWeight;
+ }
+
+ public void setTotalWeight(Float totalWeight) {
+ this.totalWeight = totalWeight;
+ }
+
+ public Float getSortedWeight() {
+ return sortedWeight;
+ }
+
+ public void setSortedWeight(Float sortedWeight) {
+ this.sortedWeight = sortedWeight;
+ }
+
+ public Float getAverageWeight() {
+ return averageWeight;
+ }
+
+ public void setAverageWeight(Float averageWeight) {
+ this.averageWeight = averageWeight;
+ }
+
+ public Float getAverageSize() {
+ return averageSize;
+ }
+
+ public void setAverageSize(Float averageSize) {
+ this.averageSize = averageSize;
+ }
+
public Integer getNumber() {
return number;
}
@@ -84,4 +173,12 @@
public void setNumber(Integer number) {
this.number = number;
}
+
+ public Float getMoule() {
+ return moule;
+ }
+
+ public void setMoule(Float moule) {
+ this.moule = moule;
+ }
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -24,13 +24,9 @@
* #L%
*/
-import com.google.common.base.Preconditions;
import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
-import fr.ifremer.tutti.persistence.entities.referential.Species;
import fr.ifremer.tutti.service.TuttiCsvUtil;
import fr.ifremer.tutti.service.export.ExportBatchEntry;
-import org.nuiton.csv.Common;
-import org.nuiton.csv.ValueFormatter;
import static org.nuiton.i18n.I18n.t;
@@ -43,24 +39,22 @@
public CatchRowModel(char separator) {
super(separator);
- // export definition
-
- newColumnForExport(t("tutti.service.exportSumatra.header.station"), CatchRow.PROPERTY_FISHING_OPERATION, new ValueFormatter<FishingOperation>() {
- @Override
- public String format(FishingOperation o) {
- Preconditions.checkNotNull(o, t("tutti.service.exportSumatra.error.station.null"));
- return o.getStationNumber();
- }
- });
- newColumnForExport(t("tutti.service.exportSumatra.header.species"), CatchRow.PROPERTY_SPECIES, new ValueFormatter<Species>() {
- @Override
- public String format(Species s) {
- Preconditions.checkNotNull(s, t("tutti.service.exportSumatra.error.species.null"));
- return s.getName();
- }
- });
- newColumnForExport(t("tutti.service.exportSumatra.header.weight"), CatchRow.PROPERTY_WEIGHT, Common.PRIMITIVE_FLOAT);
- newColumnForExport(t("tutti.service.exportSumatra.header.number"), CatchRow.PROPERTY_NUMBER, Common.PRIMITIVE_INTEGER);
+ newColumnForExport(t("tutti.service.exportSumatra.header.year"), CatchRow.PROPERTY_GEAR_SHOOTING_START_DATE, TuttiCsvUtil.YEAR);
+ newColumnForExport(t("tutti.service.exportSumatra.header.station"), CatchRow.PROPERTY_STATION_NUMBER);
+ newColumnForExport(t("tutti.service.exportSumatra.header.multirigAggregation"), CatchRow.PROPERTY_MULTIRIG_AGGREGATION);
+ newColumnForExport(t("tutti.service.exportSumatra.header.genuisSpecies"), CatchRow.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_NAME_FORMATTER);
+ newColumnForExport(t("tutti.service.exportSumatra.header.surveySpecies"), CatchRow.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_SURVEY_CODE_FORMATTER);
+ newColumnForExport(t("tutti.service.exportSumatra.header.sign"), CatchRow.PROPERTY_SIGN);
+ newColumnForExport(t("tutti.service.exportSumatra.header.sortedWeight"), CatchRow.PROPERTY_SORTED_WEIGHT, TuttiCsvUtil.PRIMITIVE_FLOAT);
+ newColumnForExport(t("tutti.service.exportSumatra.header.totalWeight"), CatchRow.PROPERTY_TOTAL_WEIGHT, TuttiCsvUtil.PRIMITIVE_FLOAT);
+ newColumnForExport(t("tutti.service.exportSumatra.header.averageWeight"), CatchRow.PROPERTY_AVERAGE_WEIGHT, TuttiCsvUtil.FLOAT);
+ newColumnForExport(t("tutti.service.exportSumatra.header.averageSize"), CatchRow.PROPERTY_AVERAGE_SIZE, TuttiCsvUtil.FLOAT);
+ newColumnForExport(t("tutti.service.exportSumatra.header.number"), CatchRow.PROPERTY_NUMBER, TuttiCsvUtil.PRIMITIVE_INTEGER);
+ newColumnForExport(t("tutti.service.exportSumatra.header.moule"), CatchRow.PROPERTY_MOULE, TuttiCsvUtil.FLOAT);
+ newColumnForExport(t("tutti.service.exportSumatra.header.startLatitude"), CatchRow.PROPERTY_GEAR_SHOOTING_START_LATITUDE, TuttiCsvUtil.FLOAT);
+ newColumnForExport(t("tutti.service.exportSumatra.header.startLongitude"), CatchRow.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, TuttiCsvUtil.FLOAT);
+ newColumnForExport(t("tutti.service.exportSumatra.header.endLatitude"), CatchRow.PROPERTY_GEAR_SHOOTING_END_LATITUDE, TuttiCsvUtil.FLOAT);
+ newColumnForExport(t("tutti.service.exportSumatra.header.endLongitude"), CatchRow.PROPERTY_GEAR_SHOOTING_END_LONGITUDE, TuttiCsvUtil.FLOAT);
}
@Override
@@ -72,8 +66,20 @@
CatchRow row = newEmptyInstance();
row.setFishingOperation(operation);
row.setSpecies(entry.getBatch().getSpecies());
- row.setWeight(entry.getTotalWeight());
- row.setNumber(entry.getTotalNumber());
+ row.setSortedWeight(entry.getSortedWeight());
+ float totalWeight = entry.getTotalWeight();
+ int number = entry.getTotalNumber();
+
+ row.setNumber(number);
+ row.setTotalWeight(totalWeight);
+
+ // average size
+ row.setAverageSize(entry.getAverageFrequency());
+
+ // avarage weight
+ row.setAverageWeight(number == 0 ? null : totalWeight / (float) number);
+ // moule
+ row.setMoule(totalWeight == 0 ? null : (float) number / totalWeight);
return row;
}
Deleted: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModelV2.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModelV2.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModelV2.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -1,83 +0,0 @@
-package fr.ifremer.tutti.service.export.sumatra;
-
-/*
- * #%L
- * Tutti :: Service
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
-import fr.ifremer.tutti.service.TuttiCsvUtil;
-import fr.ifremer.tutti.service.export.ExportBatchEntry;
-
-import static org.nuiton.i18n.I18n.t;
-
-/**
- * @author tchemit
- * @since 3.3
- */
-public class CatchRowModelV2 extends TuttiCsvUtil.AbstractTuttiImportExportModel<CatchRowV2> {
-
- public CatchRowModelV2(char separator) {
- super(separator);
-
- newColumnForExport(t("tutti.service.exportSumatraV2.header.year"), CatchRowV2.PROPERTY_GEAR_SHOOTING_START_DATE, TuttiCsvUtil.YEAR);
- newColumnForExport(t("tutti.service.exportSumatraV2.header.station"), CatchRowV2.PROPERTY_STATION_NUMBER);
- newColumnForExport(t("tutti.service.exportSumatraV2.header.multirigAggregation"), CatchRowV2.PROPERTY_MULTIRIG_AGGREGATION);
-
- newColumnForExport(t("tutti.service.exportSumatraV2.header.species"), CatchRowV2.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_SURVEY_CODE_FORMATTER);
- newColumnForExport(t("tutti.service.exportSumatraV2.header.sign"), CatchRowV2.PROPERTY_SIGN);
-
- newColumnForExport(t("tutti.service.exportSumatraV2.header.sortedWeight"), CatchRowV2.PROPERTY_SORTED_WEIGHT, TuttiCsvUtil.PRIMITIVE_FLOAT);
- newColumnForExport(t("tutti.service.exportSumatraV2.header.totalWeight"), CatchRowV2.PROPERTY_TOTAL_WEIGHT, TuttiCsvUtil.PRIMITIVE_FLOAT);
- newColumnForExport(t("tutti.service.exportSumatraV2.header.averageWeight"), CatchRowV2.PROPERTY_AVERAGE_WEIGHT, TuttiCsvUtil.NUMBER_OR_NA);
- newColumnForExport(t("tutti.service.exportSumatraV2.header.averageSize"), CatchRowV2.PROPERTY_AVERAGE_SIZE, TuttiCsvUtil.NUMBER_OR_NA);
- newColumnForExport(t("tutti.service.exportSumatraV2.header.number"), CatchRowV2.PROPERTY_NUMBER, TuttiCsvUtil.PRIMITIVE_INTEGER);
- newColumnForExport(t("tutti.service.exportSumatraV2.header.moule"), CatchRowV2.PROPERTY_MOULE, TuttiCsvUtil.NUMBER_OR_NA);
- }
-
- @Override
- public CatchRowV2 newEmptyInstance() {
- return new CatchRowV2();
- }
-
- public CatchRowV2 newRow(FishingOperation operation, ExportBatchEntry entry) {
- CatchRowV2 row = newEmptyInstance();
- row.setFishingOperation(operation);
- row.setSpecies(entry.getBatch().getSpecies());
- row.setSortedWeight(entry.getSortedWeight());
- float totalWeight = entry.getTotalWeight();
- int number = entry.getTotalNumber();
-
- row.setNumber(number);
- row.setTotalWeight(totalWeight);
-
- // average size
- row.setAverageSize(entry.getAverageFrequency());
-
- // avarage weight
- row.setAverageWeight(number == 0 ? null : totalWeight / (float) number);
- // moule
- row.setMoule(totalWeight == 0 ? null : (float) number / totalWeight);
- return row;
- }
-
-}
Deleted: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowV2.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowV2.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowV2.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -1,160 +0,0 @@
-package fr.ifremer.tutti.service.export.sumatra;
-
-/*
- * #%L
- * Tutti :: Service
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
-import fr.ifremer.tutti.persistence.entities.referential.Species;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author tchemit
- * @since 3.3
- */
-public class CatchRowV2 implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String PROPERTY_STATION_NUMBER = FishingOperation.PROPERTY_STATION_NUMBER;
-
- public static final String PROPERTY_GEAR_SHOOTING_START_DATE = FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE;
-
- public static final String PROPERTY_MULTIRIG_AGGREGATION = FishingOperation.PROPERTY_MULTIRIG_AGGREGATION;
-
- public static final String PROPERTY_SPECIES = "species";
-
- public static final String PROPERTY_SIGN = "sign";
-
- public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight";
-
- public static final String PROPERTY_SORTED_WEIGHT = "sortedWeight";
-
- public static final String PROPERTY_AVERAGE_WEIGHT = "averageWeight";
-
- public static final String PROPERTY_AVERAGE_SIZE = "averageSize";
-
- public static final String PROPERTY_NUMBER = "number";
-
- public static final String PROPERTY_MOULE = "moule";
-
- protected FishingOperation fishingOperation;
-
- protected Species species;
-
- protected String sign;
-
- protected Float totalWeight;
-
- protected Float sortedWeight;
-
- protected Float averageWeight;
-
- protected Float averageSize;
-
- protected Integer number;
-
- protected Float moule;
-
- public String getStationNumber() {
- return fishingOperation.getStationNumber();
- }
-
- public Date getGearShootingStartDate() {
- return fishingOperation.getGearShootingStartDate();
- }
-
- public String getMultirigAggregation() {
- return fishingOperation.getMultirigAggregation();
- }
-
- public void setFishingOperation(FishingOperation fishingOperation) {
- this.fishingOperation = fishingOperation;
- }
-
- public Species getSpecies() {
- return species;
- }
-
- public void setSpecies(Species species) {
- this.species = species;
- }
-
- public String getSign() {
- return sign;
- }
-
- public void setSign(String sign) {
- this.sign = sign;
- }
-
- public Float getTotalWeight() {
- return totalWeight;
- }
-
- public void setTotalWeight(Float totalWeight) {
- this.totalWeight = totalWeight;
- }
-
- public Float getSortedWeight() {
- return sortedWeight;
- }
-
- public void setSortedWeight(Float sortedWeight) {
- this.sortedWeight = sortedWeight;
- }
-
- public Float getAverageWeight() {
- return averageWeight;
- }
-
- public void setAverageWeight(Float averageWeight) {
- this.averageWeight = averageWeight;
- }
-
- public Float getAverageSize() {
- return averageSize;
- }
-
- public void setAverageSize(Float averageSize) {
- this.averageSize = averageSize;
- }
-
- public Integer getNumber() {
- return number;
- }
-
- public void setNumber(Integer number) {
- this.number = number;
- }
-
- public Float getMoule() {
- return moule;
- }
-
- public void setMoule(Float moule) {
- this.moule = moule;
- }
-}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -31,6 +31,7 @@
import fr.ifremer.tutti.persistence.ProgressionModel;
import fr.ifremer.tutti.persistence.entities.data.Cruise;
import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
+import fr.ifremer.tutti.persistence.entities.referential.Species;
import fr.ifremer.tutti.service.AbstractTuttiService;
import fr.ifremer.tutti.service.PersistenceService;
import fr.ifremer.tutti.service.TuttiServiceContext;
@@ -45,7 +46,9 @@
import java.io.BufferedWriter;
import java.io.File;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import static org.nuiton.i18n.I18n.t;
@@ -74,11 +77,12 @@
*
* @param file where to generate report
* @param cruiseId id of the cruise to export
+ * @return export result
* @since 2.0
*/
- public void exportCruiseForSumatra(File file,
- String cruiseId,
- ProgressionModel progressionModel) {
+ public SumatraExportResult exportCruiseForSumatra(File file,
+ String cruiseId,
+ ProgressionModel progressionModel) {
Preconditions.checkNotNull(cruiseId, "Cannot export a null cruise");
Preconditions.checkNotNull(file, "Cannot export to a null file");
@@ -103,7 +107,11 @@
progressionModel.adaptTotal(operations.size() + 3);
- prepareOperationsAndExport(file, operations, progressionModel);
+ SumatraExportResult result = new SumatraExportResult();
+
+ prepareOperationsAndExport(file, operations, progressionModel, result);
+
+ return result;
}
/**
@@ -112,12 +120,13 @@
* @param file where to generate report
* @param cruiseId id of the cruise to export
* @param fishingOperationId id of the fishing operation to export
+ * @return export result
* @since 2.7
*/
- public void exportFishingOperationForSumatra(File file,
- String cruiseId,
- String fishingOperationId,
- ProgressionModel progressionModel) {
+ public SumatraExportResult exportFishingOperationForSumatra(File file,
+ String cruiseId,
+ String fishingOperationId,
+ ProgressionModel progressionModel) {
Preconditions.checkNotNull(file, "Cannot export to a null file");
Preconditions.checkNotNull(cruiseId, "Cannot export a null cruise");
@@ -135,12 +144,17 @@
List<String> operations = Lists.newArrayList(fishingOperationId);
- prepareOperationsAndExport(file, operations, progressionModel);
+ SumatraExportResult result = new SumatraExportResult();
+
+ prepareOperationsAndExport(file, operations, progressionModel, result);
+
+ return result;
}
protected void prepareOperationsAndExport(File file,
List<String> operations,
- ProgressionModel progressionModel) {
+ ProgressionModel progressionModel,
+ SumatraExportResult result) {
List<CatchRow> rows = Lists.newArrayList();
@@ -159,7 +173,7 @@
break;
}
- prepareFishingOperation(csvModel, rows, operationId);
+ prepareFishingOperation(csvModel, rows, operationId, result);
}
}
@@ -181,40 +195,60 @@
protected void prepareFishingOperation(CatchRowModel csvModel,
List<CatchRow> rows,
- String operationId) {
+ String operationId,
+ SumatraExportResult result) {
ExportCatchContext exportContext = ExportCatchContext.newExportContext(
persistenceService,
weightComputingService,
operationId,
- false);
+ true);
FishingOperation operation = exportContext.getFishingOperation();
// Species
if (exportContext.withSpeciesBatches()) {
+ Set<Species> allspecies = new HashSet<>();
+
List<ExportBatchEntry> entries =
exportContext.getSpeciesBatchEntry(true);
for (ExportBatchEntry entry : entries) {
+ // get species campaign code from protocol
+
+ allspecies.add(entry.getBatch().getSpecies());
+
CatchRow row = csvModel.newRow(operation, entry);
+ row.getSpecies();
rows.add(row);
}
+
+ // fill survey code in species
+ Set<String> badSpecies = persistenceService.fillSpeciesSurveyCode(allspecies);
+ result.setBadSpecies(badSpecies);
+
}
// Benthos
if (exportContext.withBenthosBatches()) {
+ Set<Species> allspecies = new HashSet<>();
+
List<ExportBatchEntry> entries =
exportContext.getBenthosBatchEntry(true);
for (ExportBatchEntry entry : entries) {
CatchRow row = csvModel.newRow(operation, entry);
+ allspecies.add(entry.getBatch().getSpecies());
rows.add(row);
}
+
+ // fill survey code in benthos
+ Set<String> badBenthos = persistenceService.fillBenthosSurveyCode(allspecies);
+ result.setBadBenthos(badBenthos);
}
}
}
Deleted: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceV2.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceV2.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceV2.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -1,242 +0,0 @@
-package fr.ifremer.tutti.service.export.sumatra;
-
-/*
- * #%L
- * Tutti :: Service
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
-import fr.ifremer.tutti.persistence.ProgressionModel;
-import fr.ifremer.tutti.persistence.entities.data.Cruise;
-import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
-import fr.ifremer.tutti.persistence.entities.referential.Species;
-import fr.ifremer.tutti.service.AbstractTuttiService;
-import fr.ifremer.tutti.service.PersistenceService;
-import fr.ifremer.tutti.service.TuttiServiceContext;
-import fr.ifremer.tutti.service.catches.WeightComputingService;
-import fr.ifremer.tutti.service.export.ExportBatchEntry;
-import fr.ifremer.tutti.service.export.ExportCatchContext;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.csv.Export;
-import org.nuiton.jaxx.application.ApplicationTechnicalException;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.nuiton.i18n.I18n.t;
-
-/**
- * To export as sumatra format (v2).
- *
- * @author tchemit
- * @since 3.3
- */
-public class CatchesSumatraExportServiceV2 extends AbstractTuttiService {
-
- private static final Log log =
- LogFactory.getLog(CatchesSumatraExportServiceV2.class);
-
- protected PersistenceService persistenceService;
-
- protected WeightComputingService weightComputingService;
-
- @Override
- public void setServiceContext(TuttiServiceContext context) {
- super.setServiceContext(context);
- persistenceService = getService(PersistenceService.class);
- weightComputingService = getService(WeightComputingService.class);
- }
-
- /**
- * Export selected cruise with the csv sumatra (v2) format.
- *
- * @param file where to generate report
- * @param cruiseId id of the cruise to export
- * @since 3.3
- */
- public void exportCruiseForSumatra(File file,
- String cruiseId,
- ProgressionModel progressionModel) {
-
- Preconditions.checkNotNull(cruiseId, "Cannot export a null cruise");
- Preconditions.checkNotNull(file, "Cannot export to a null file");
-
- if (log.isInfoEnabled()) {
- log.info("Will export cruise " + cruiseId + " to file: " + file);
- }
-
- progressionModel.increments(t("tutti.service.sumatra.export.step.load.cruise", cruiseId));
-
- Cruise cruise = persistenceService.getCruise(cruiseId);
- Preconditions.checkNotNull(cruise, "Cruise [" + cruiseId + "] not found");
-
- progressionModel.increments(t("tutti.service.sumatra.export.step.load.fishingOperationIds"));
-
- List<String> operations =
- persistenceService.getAllFishingOperationIds(cruiseId);
-
- if (log.isInfoEnabled()) {
- log.info(operations.size() + " operations found for cruise: " + cruiseId);
- }
-
- progressionModel.adaptTotal(operations.size() + 3);
-
- prepareOperationsAndExport(file, operations, progressionModel);
- }
-
- /**
- * Export selected fishing operation with the csv sumatra (v2) format.
- *
- * @param file where to generate report
- * @param cruiseId id of the cruise to export
- * @param fishingOperationId id of the fishing operation to export
- * @since 3.3
- */
- public void exportFishingOperationForSumatra(File file,
- String cruiseId,
- String fishingOperationId,
- ProgressionModel progressionModel) {
-
- Preconditions.checkNotNull(file, "Cannot export to a null file");
- Preconditions.checkNotNull(cruiseId, "Cannot export a null cruise");
- Preconditions.checkNotNull(fishingOperationId, "Cannot export a null fishing operation");
-
- if (log.isInfoEnabled()) {
- log.info("Will export fishing operation " +
- fishingOperationId + " to file: " + file);
- }
-
- progressionModel.increments(t("tutti.service.sumatra.export.step.load.cruise", cruiseId));
-
- Cruise cruise = persistenceService.getCruise(cruiseId);
- Preconditions.checkNotNull(cruise, "Cruise [" + cruiseId + "] not found");
-
- List<String> operations = Lists.newArrayList(fishingOperationId);
-
- prepareOperationsAndExport(file, operations, progressionModel);
- }
-
- protected void prepareOperationsAndExport(File file,
- List<String> operations,
- ProgressionModel progressionModel) {
-
- List<CatchRowV2> rows = Lists.newArrayList();
-
- CatchRowModelV2 csvModel =
- new CatchRowModelV2(context.getConfig().getCsvSeparator());
-
- if (operations != null) {
- for (String operationId : operations) {
-
- progressionModel.increments(t("tutti.service.sumatra.export.step.load.fishingOperation", operationId));
- if (!persistenceService.isFishingOperationWithCatchBatch(operationId)) {
-
- if (log.isWarnEnabled()) {
- log.warn("No catch for operation with id: " + operationId);
- }
- break;
- }
-
- prepareFishingOperation(csvModel, rows, operationId);
- }
- }
-
- progressionModel.increments(t("tutti.service.sumatra.export.step.export", file));
-
-
- BufferedWriter writer = null;
- try {
- writer = Files.newWriter(file, Charsets.UTF_8);
- Export export = Export.newExport(csvModel, rows);
- export.write(writer);
- writer.close();
-
- } catch (Exception e) {
- throw new ApplicationTechnicalException(t("tutti.service.sumatra.export.error", file), e);
- } finally {
- IOUtils.closeQuietly(writer);
- }
- }
-
- protected void prepareFishingOperation(CatchRowModelV2 csvModel,
- List<CatchRowV2> rows,
- String operationId) {
-
- ExportCatchContext exportContext = ExportCatchContext.newExportContext(
- persistenceService,
- weightComputingService,
- operationId,
- true);
-
- FishingOperation operation = exportContext.getFishingOperation();
-
- // Species
- if (exportContext.withSpeciesBatches()) {
-
- Set<Species> allspecies = new HashSet<>();
-
- List<ExportBatchEntry> entries =
- exportContext.getSpeciesBatchEntry(true);
-
- for (ExportBatchEntry entry : entries) {
-
- // get species campaign code from protocol
-
- allspecies.add(entry.getBatch().getSpecies());
-
- CatchRowV2 row = csvModel.newRow(operation, entry);
- row.getSpecies();
- rows.add(row);
- }
-
- // fill survey code in species
- persistenceService.fillSpeciesSurveyCode(allspecies);
- }
-
- // Benthos
- if (exportContext.withBenthosBatches()) {
-
- Set<Species> allspecies = new HashSet<>();
-
- List<ExportBatchEntry> entries =
- exportContext.getBenthosBatchEntry(true);
-
- for (ExportBatchEntry entry : entries) {
-
- CatchRowV2 row = csvModel.newRow(operation, entry);
- allspecies.add(entry.getBatch().getSpecies());
- rows.add(row);
- }
-
- // fill survey code in benthos
- persistenceService.fillBenthosSurveyCode(allspecies);
- }
- }
-}
Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java (rev 0)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -0,0 +1,72 @@
+package fr.ifremer.tutti.service.export.sumatra;
+
+/*
+ * #%L
+ * Tutti :: Service
+ * $Id$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2012 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.Set;
+
+/**
+ * Created on 5/20/14.
+ *
+ * @author Tony Chemit <chemit(a)codelutin.com>
+ * @since 3.4.4
+ */
+public class SumatraExportResult {
+
+ /**
+ * Name of species that are not well filled in protocol.
+ */
+ protected Set<String> badSpecies;
+
+ /**
+ * Name of benthos that are not well filled in protocol.
+ */
+ protected Set<String> badBenthos;
+
+ public Set<String> getBadSpecies() {
+ return badSpecies;
+ }
+
+ public Set<String> getBadBenthos() {
+ return badBenthos;
+ }
+
+ public void setBadSpecies(Set<String> badSpecies) {
+ this.badSpecies = badSpecies;
+ }
+
+ public void setBadBenthos(Set<String> badSBenthos) {
+ this.badBenthos = badSBenthos;
+ }
+
+ public boolean withBadSpecies() {
+ return CollectionUtils.isNotEmpty(badSpecies);
+ }
+
+ public boolean withBadBenthos() {
+ return CollectionUtils.isNotEmpty(badBenthos);
+ }
+}
Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties
===================================================================
--- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2014-05-20 14:35:16 UTC (rev 1793)
@@ -78,10 +78,24 @@
tutti.service.exportCruise.exportSurvey=
tutti.service.exportSumatra.error.species.null=
tutti.service.exportSumatra.error.station.null=
+tutti.service.exportSumatra.header.averageSize=
+tutti.service.exportSumatra.header.averageWeight=
+tutti.service.exportSumatra.header.endLatitude=
+tutti.service.exportSumatra.header.endLongitude=
+tutti.service.exportSumatra.header.genuisSpecies=
+tutti.service.exportSumatra.header.moule=
+tutti.service.exportSumatra.header.multirigAggregation=
tutti.service.exportSumatra.header.number=
+tutti.service.exportSumatra.header.sign=
+tutti.service.exportSumatra.header.sortedWeight=
tutti.service.exportSumatra.header.species=
+tutti.service.exportSumatra.header.startLatitude=
+tutti.service.exportSumatra.header.startLongitude=
tutti.service.exportSumatra.header.station=
+tutti.service.exportSumatra.header.surveySpecies=
+tutti.service.exportSumatra.header.totalWeight=
tutti.service.exportSumatra.header.weight=
+tutti.service.exportSumatra.header.year=
tutti.service.exportSumatraV2.header.averageSize=Averagesize
tutti.service.exportSumatraV2.header.averageWeight=AverageWeight
tutti.service.exportSumatraV2.header.moule=Moule
Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
===================================================================
--- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2014-05-20 14:35:16 UTC (rev 1793)
@@ -1,5 +1,3 @@
-tutti.error.benthos.not.in.protocol=L'espèce (onglet Benthos) %s n'est pas déclarée dans le protocole.
-tutti.error.species.not.in.protocol=L'espèce %s (onglet Espèce) n'est pas déclarée dans le protocole.
tutti.io.mkDir.error=Erreur à la création du dossier %s
tutti.property.attachment=Pièce jointe
tutti.property.caracteristic=Caractéristique
@@ -77,21 +75,23 @@
tutti.service.exportCruise.exportSurvey=<html>Export du fichier <strong>survey.csv</strong> pour la campagne %s</html>
tutti.service.exportSumatra.error.species.null=L'espèce est nulle
tutti.service.exportSumatra.error.station.null=Le trait est nul
-tutti.service.exportSumatra.header.number=NbIndividus
-tutti.service.exportSumatra.header.species=Espèce
-tutti.service.exportSumatra.header.station=Station
-tutti.service.exportSumatra.header.weight=Total
-tutti.service.exportSumatraV2.header.averageSize=LongueurMoy
-tutti.service.exportSumatraV2.header.averageWeight=PoidsMoy
-tutti.service.exportSumatraV2.header.moule=Moule
-tutti.service.exportSumatraV2.header.multirigAggregation=Poche
-tutti.service.exportSumatraV2.header.number=NbIndividus
-tutti.service.exportSumatraV2.header.sign=Signe
-tutti.service.exportSumatraV2.header.sortedWeight=Tri
-tutti.service.exportSumatraV2.header.species=Espèce
-tutti.service.exportSumatraV2.header.station=Station
-tutti.service.exportSumatraV2.header.totalWeight=Total
-tutti.service.exportSumatraV2.header.year=Année
+tutti.service.exportSumatra.header.averageSize=longueurmoy
+tutti.service.exportSumatra.header.averageWeight=poidsmoy
+tutti.service.exportSumatra.header.endLatitude=latitudefin
+tutti.service.exportSumatra.header.endLongitude=longitudefin
+tutti.service.exportSumatra.header.genuisSpecies=especescientifique
+tutti.service.exportSumatra.header.moule=moule
+tutti.service.exportSumatra.header.multirigAggregation=poche
+tutti.service.exportSumatra.header.number=nbindividus
+tutti.service.exportSumatra.header.sign=signe
+tutti.service.exportSumatra.header.sortedWeight=tri
+tutti.service.exportSumatra.header.startLatitude=latitudedebut
+tutti.service.exportSumatra.header.startLongitude=longitudedebut
+tutti.service.exportSumatra.header.station=station
+tutti.service.exportSumatra.header.surveySpecies=espececampagne
+tutti.service.exportSumatra.header.totalWeight=total
+tutti.service.exportSumatra.header.weight=total
+tutti.service.exportSumatra.header.year=annee
tutti.service.multipost.attachment.copy.error=Erreur lors de l'export de la pièce-jointe %s
tutti.service.multipost.attachment.mkdir.error=Impossible de créer le répertoire %s
tutti.service.multipost.export.attachments.error=Erreur lors de l'export des pièces-jointes
Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -25,6 +25,8 @@
*/
import fr.ifremer.tutti.persistence.ProgressionModel;
+import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
+import fr.ifremer.tutti.service.PersistenceService;
import fr.ifremer.tutti.service.ServiceDbResource;
import fr.ifremer.tutti.service.TuttiServiceContext;
import fr.ifremer.tutti.service.catches.TuttiWeightComputingException;
@@ -59,10 +61,10 @@
public static final String OPERATION_BAD_3_ID = "100115";
public static final String EXPORT_CONTENT =
- "Station;Espèce;Total;NbIndividus\n" +
- "A;Chama magna;100.0;40\n" +
- "A;Echinogammarus;100.0;417\n" +
- "A;Brissopsis atlantica;100.0;94";
+ "annee;station;poche;especescientifique;espececampagne;signe;tri;total;poidsmoy;longueurmoy;nbindividus;moule;latitudedebut;longitudedebut;latitudefin;longitudefin\n" +
+ "2013;A;1;Chama magna;CHAMMAG;;100.0;100.0;2.5;;40;0.4;;;;\n" +
+ "2013;A;1;Echinogammarus;ECHIGAM;;100.0;100.0;0.23980816;;417;4.17;;;;\n" +
+ "2013;A;1;Brissopsis atlantica;BRISATLAN;;100.0;100.0;1.0638298;10.571428;94;0.94;;;;";
protected CatchesSumatraExportService service;
@@ -79,6 +81,12 @@
dbResource.openDataContext();
+ File protocolFile = new File("src/test/resources/tuttiProtocol.tuttiProtocol");
+
+ TuttiProtocol protocol = dbResource.loadProtocol(protocolFile);
+
+ serviceContext.getService(PersistenceService.class).setProtocol(protocol);
+
service = serviceContext.getService(CatchesSumatraExportService.class);
}
@@ -100,8 +108,7 @@
@Test
public void testExportCruiseForSumatra() throws Exception {
- dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 1,
- OPERATION_1_ID);
+ dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 1, OPERATION_1_ID);
File exportFile = new File(dataDirectory, "exportSumatra.csv");
Deleted: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceV2Test.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceV2Test.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceV2Test.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -1,123 +0,0 @@
-package fr.ifremer.tutti.service.export.sumatra;
-
-/*
- * #%L
- * Tutti :: Service
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import fr.ifremer.tutti.persistence.ProgressionModel;
-import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
-import fr.ifremer.tutti.service.PersistenceService;
-import fr.ifremer.tutti.service.ServiceDbResource;
-import fr.ifremer.tutti.service.TuttiServiceContext;
-import fr.ifremer.tutti.service.catches.TuttiWeightComputingException;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import java.io.File;
-
-/**
- * @author tchemit <chemit(a)codelutin.com>
- * @since 3.3
- */
-public class CatchesSumatraExportServiceV2Test {
-
- @ClassRule
- public static final ServiceDbResource dbResource =
- ServiceDbResource.readDb("dbExport");
-
- public static final String PROGRAM_ID = "CAM-TEST_ELEVATION";
-
- public static final String CRUISE_BAD_ID = "100003";
-
- public static final String CRUISE_ID = "100004";
-
- public static final String OPERATION_1_ID = "100116";
-
- public static final String OPERATION_BAD_1_ID = "100112";
-
- public static final String OPERATION_BAD_2_ID = "100113";
-
- public static final String OPERATION_BAD_3_ID = "100115";
-
- public static final String EXPORT_CONTENT =
- "Année;Station;Poche;Espèce;Signe;Tri;Total;PoidsMoy;LongueurMoy;NbIndividus;Moule\n" +
- "2013;A;1;CHAMMAG;;100.0;100.0;2.5;NA;40;0.4\n" +
- "2013;A;1;ECHIGAM;;100.0;100.0;0.23980816;NA;417;4.17\n" +
- "2013;A;1;BRISATLAN;;100.0;100.0;1.0638298;10.571428;94;0.94";
-
- protected CatchesSumatraExportServiceV2 service;
-
- protected ServiceDbResource.DataContext dataContext;
-
- protected File dataDirectory;
-
- @Before
- public void setUp() throws Exception {
-
- dataDirectory = dbResource.getConfig().getDataDirectory();
-
- TuttiServiceContext serviceContext = dbResource.getServiceContext();
-
- dbResource.openDataContext();
-
- File protocolFile = new File("src/test/resources/tuttiProtocol.tuttiProtocol");
-
- TuttiProtocol protocol = dbResource.loadProtocol(protocolFile);
-
- serviceContext.getService(PersistenceService.class).setProtocol(protocol);
-
- service = serviceContext.getService(CatchesSumatraExportServiceV2.class);
- }
-
- @Test(expected = TuttiWeightComputingException.class)
- public void testExportCruiseForSumatraBadCruise() throws Exception {
-
- dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_BAD_ID, 3,
- OPERATION_BAD_2_ID,
- OPERATION_BAD_1_ID,
- OPERATION_BAD_3_ID);
-
- File exportFile = new File(dataDirectory, "exportSumatra.csv");
-
- ProgressionModel progressionModel = new ProgressionModel();
- progressionModel.setTotal(3);
- service.exportCruiseForSumatra(exportFile, CRUISE_BAD_ID, progressionModel);
- }
-
- @Test
- public void testExportCruiseForSumatra() throws Exception {
-
- dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 1, OPERATION_1_ID);
-
- File exportFile = new File(dataDirectory, "exportSumatra.csv");
-
- ProgressionModel progressionModel = new ProgressionModel();
- progressionModel.setTotal(3);
- service.exportCruiseForSumatra(exportFile, CRUISE_ID, progressionModel);
-
- ServiceDbResource.assertFileContent("Sumatra export file:\n",
- exportFile,
- EXPORT_CONTENT);
- }
-}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -43,7 +43,6 @@
import fr.ifremer.tutti.service.export.generic.TuttiExportService;
import fr.ifremer.tutti.service.export.pdf.CatchesPdfExportService;
import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportService;
-import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceV2;
import fr.ifremer.tutti.service.protocol.ProtocolImportExportService;
import fr.ifremer.tutti.service.psionimport.PsionImportService;
import fr.ifremer.tutti.service.pupitri.PupitriImportExportService;
@@ -694,10 +693,6 @@
return serviceContext.getService(CatchesSumatraExportService.class);
}
- public CatchesSumatraExportServiceV2 getCatchesSumatraExportServiceV2() {
- return serviceContext.getService(CatchesSumatraExportServiceV2.class);
- }
-
public MultiPostImportService getMultiPostImportService() {
return serviceContext.getService(MultiPostImportService.class);
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -28,6 +28,7 @@
import fr.ifremer.tutti.persistence.ProgressionModel;
import fr.ifremer.tutti.persistence.entities.data.Cruise;
import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportService;
+import fr.ifremer.tutti.service.export.sumatra.SumatraExportResult;
import fr.ifremer.tutti.ui.swing.content.MainUIHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -52,6 +53,8 @@
protected File file;
+ protected SumatraExportResult sumatraExportResult;
+
public ExportCruiseForSumatraAction(MainUIHandler handler) {
super(handler, false);
}
@@ -63,6 +66,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(
@@ -80,6 +94,7 @@
@Override
public void releaseAction() {
file = null;
+ sumatraExportResult = null;
super.releaseAction();
}
@@ -100,13 +115,38 @@
// export catches
CatchesSumatraExportService service =
getContext().getCatchesSumatraExportService();
- service.exportCruiseForSumatra(file, cruise.getId(), pm);
+ sumatraExportResult = service.exportCruiseForSumatra(file, cruise.getId(), pm);
}
@Override
public void postSuccessAction() {
super.postSuccessAction();
+
+ if (sumatraExportResult.withBadSpecies()) {
+
+ StringBuilder badSpeciesList = new StringBuilder();
+ for (String s : sumatraExportResult.getBadSpecies()) {
+ badSpeciesList.append("<li>").append(s);
+ }
+
+ displayWarningMessage(
+ t("tutti.exportFishingOperationForSumatra.title.badSpecies"),
+ t("tutti.exportFishingOperationForSumatra.message.badSpecies", badSpeciesList.toString()));
+ }
+
+ if (sumatraExportResult.withBadBenthos()) {
+
+ StringBuilder badBenthosList = new StringBuilder();
+ for (String s : sumatraExportResult.getBadBenthos()) {
+ badBenthosList.append("<li>").append(s);
+ }
+
+ displayWarningMessage(
+ t("tutti.exportFishingOperationForSumatra.title.badBenthos"),
+ t("tutti.exportFishingOperationForSumatra.message.badBenthos", badBenthosList.toString()));
+ }
+
sendMessage(t("tutti.exportCruiseForSumatra.action.success", file));
}
}
Deleted: 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-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraV2Action.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -1,123 +0,0 @@
-package fr.ifremer.tutti.ui.swing.action;
-
-/*
- * #%L
- * Tutti :: UI
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.base.Preconditions;
-import fr.ifremer.tutti.persistence.ProgressionModel;
-import fr.ifremer.tutti.persistence.entities.data.Cruise;
-import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceV2;
-import fr.ifremer.tutti.ui.swing.content.MainUIHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.DateUtil;
-
-import java.io.File;
-import java.util.Date;
-
-import static org.nuiton.i18n.I18n.t;
-
-/**
- * Export the hole cruise using the sumatra format (V2).
- *
- * @author tchemit
- * @since 3.3
- */
-public class ExportCruiseForSumatraV2Action extends AbstractMainUITuttiAction {
-
- /** Logger. */
- private static final Log log =
- LogFactory.getLog(ExportCruiseForSumatraV2Action.class);
-
- protected File file;
-
- public ExportCruiseForSumatraV2Action(MainUIHandler handler) {
- super(handler, false);
- }
-
- @Override
- public boolean prepareAction() throws Exception {
-
- boolean doAction = super.prepareAction();
-
- 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(
- String.format("sumatra_v2_%s_%s", getDataContext().getCruise().getName(), date),
- "csv",
- t("tutti.exportCruiseForSumatraV2.title.choose.exportFile"),
- t("tutti.exportCruiseForSumatraV2.action.chooseFile"),
- "^.+\\.csv$", t("tutti.common.file.csv")
- );
- doAction = file != null;
- }
- return doAction;
- }
-
- @Override
- public void releaseAction() {
- file = null;
- super.releaseAction();
- }
-
- @Override
- public void doAction() throws Exception {
- Cruise cruise = getDataContext().getCruise();
- Preconditions.checkNotNull(cruise);
- Preconditions.checkNotNull(file);
-
- if (log.isInfoEnabled()) {
- log.info("Will export cruise " + cruise.getId() +
- " to file: " + file);
- }
- ProgressionModel pm = new ProgressionModel();
- pm.setTotal(3); // loading cruise + loading fishing operationIds + export
- setProgressionModel(pm);
-
- // export catches
- CatchesSumatraExportServiceV2 service =
- getContext().getCatchesSumatraExportServiceV2();
- service.exportCruiseForSumatra(file, cruise.getId(), pm);
-
- }
-
- @Override
- public void postSuccessAction() {
- super.postSuccessAction();
- sendMessage(t("tutti.exportCruiseForSumatraV2.action.success", file));
- }
-}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -29,6 +29,7 @@
import fr.ifremer.tutti.persistence.entities.data.Cruise;
import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportService;
+import fr.ifremer.tutti.service.export.sumatra.SumatraExportResult;
import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI;
import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler;
import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel;
@@ -55,6 +56,8 @@
protected File file;
+ protected SumatraExportResult sumatraExportResult;
+
public ExportFishingOperationForSumatraAction(EditCatchesUIHandler handler) {
super(handler, true);
}
@@ -75,6 +78,17 @@
if (doAction) {
+ if (!getDataContext().isProtocolFilled()) {
+ displayWarningMessage(
+ t("tutti.exportFishingOperationForSumatra.title.required.protocol"),
+ t("tutti.exportFishingOperationForSumatra.message.required.protocol")
+ );
+ doAction = false;
+ }
+ }
+
+ if (doAction) {
+
FishingOperation fishingOperation = getModel().getFishingOperation();
String date = DateUtil.formatDate(new Date(), "dd-MM-yyyy");
@@ -94,6 +108,7 @@
@Override
public void releaseAction() {
file = null;
+ sumatraExportResult = null;
super.releaseAction();
}
@@ -117,16 +132,42 @@
// export catches
CatchesSumatraExportService service =
getContext().getCatchesSumatraExportService();
- service.exportFishingOperationForSumatra(file,
- cruise.getId(),
- fishingOperation.getId(),
- pm);
+ sumatraExportResult = service.exportFishingOperationForSumatra(file,
+ cruise.getId(),
+ fishingOperation.getId(),
+ pm);
+
}
@Override
public void postSuccessAction() {
super.postSuccessAction();
+
+ if (sumatraExportResult.withBadSpecies()) {
+
+ StringBuilder badSpeciesList = new StringBuilder();
+ for (String s : sumatraExportResult.getBadSpecies()) {
+ badSpeciesList.append("<li>").append(s);
+ }
+
+ displayWarningMessage(
+ t("tutti.exportFishingOperationForSumatra.title.badSpecies"),
+ t("tutti.exportFishingOperationForSumatra.message.badSpecies", badSpeciesList.toString()));
+ }
+
+ if (sumatraExportResult.withBadBenthos()) {
+
+ StringBuilder badBenthosList = new StringBuilder();
+ for (String s : sumatraExportResult.getBadBenthos()) {
+ badBenthosList.append("<li>").append(s);
+ }
+
+ displayWarningMessage(
+ t("tutti.exportFishingOperationForSumatra.title.badBenthos"),
+ t("tutti.exportFishingOperationForSumatra.message.badBenthos", badBenthosList.toString()));
+ }
+
sendMessage(t("tutti.exportFishingOperationForSumatra.action.success", file));
}
}
Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraV2Action.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraV2Action.java 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraV2Action.java 2014-05-20 14:35:16 UTC (rev 1793)
@@ -1,143 +0,0 @@
-package fr.ifremer.tutti.ui.swing.action;
-
-/*
- * #%L
- * Tutti :: UI
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.base.Preconditions;
-import fr.ifremer.tutti.persistence.ProgressionModel;
-import fr.ifremer.tutti.persistence.entities.data.Cruise;
-import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
-import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceV2;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.util.DateUtil;
-
-import java.io.File;
-import java.util.Date;
-
-import static org.nuiton.i18n.I18n.t;
-
-/**
- * Created on 10/1/13.
- *
- * @author Tony Chemit <chemit(a)codelutin.com>
- * @since 3.3
- */
-public class ExportFishingOperationForSumatraV2Action extends AbstractTuttiAction<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> {
-
- /** Logger. */
- private static final Log log =
- LogFactory.getLog(ExportFishingOperationForSumatraV2Action.class);
-
- protected File file;
-
- public ExportFishingOperationForSumatraV2Action(EditCatchesUIHandler handler) {
- super(handler, true);
- }
-
- @Override
- public boolean prepareAction() throws Exception {
-
- boolean doAction = super.prepareAction();
-
- if (getModel().isModify()) {
-
- displayWarningMessage(
- t("tutti.exportFishingOperationForSumatraV2.title.model.modified"),
- t("tutti.exportFishingOperationForSumatraV2.message.model.modified")
- );
- doAction = false;
- }
-
- if (doAction) {
-
- if (!getDataContext().isProtocolFilled()) {
- displayWarningMessage(
- t("tutti.exportFishingOperationForSumatraV2.title.required.protocol"),
- t("tutti.exportFishingOperationForSumatraV2.message.required.protocol")
- );
- doAction = false;
- }
- }
-
- if (doAction) {
-
- FishingOperation fishingOperation = getModel().getFishingOperation();
-
- String date = DateUtil.formatDate(new Date(), "dd-MM-yyyy");
- // choose file to export
- file = saveFile(
- String.format("sumatra_v2_%s_%s_%s", getDataContext().getCruise().getName(), fishingOperation.getId(), date),
- "csv",
- t("tutti.exportFishingOperationForSumatraV2.title.choose.exportFile"),
- t("tutti.exportFishingOperationForSumatraV2.action.chooseFile"),
- "^.+\\.csv$", t("tutti.common.file.csv")
- );
- doAction = file != null;
- }
- return doAction;
- }
-
- @Override
- public void releaseAction() {
- file = null;
- super.releaseAction();
- }
-
- @Override
- public void doAction() throws Exception {
- Cruise cruise = getDataContext().getCruise();
- FishingOperation fishingOperation = getModel().getFishingOperation();
- Preconditions.checkNotNull(cruise);
- Preconditions.checkNotNull(fishingOperation);
- Preconditions.checkNotNull(file);
-
- if (log.isInfoEnabled()) {
- log.info("Will export fishingOperation " + cruise.getId() + "-" + fishingOperation.getStationNumber() +
- " to file: " + file);
- }
-
- ProgressionModel pm = new ProgressionModel();
- pm.setTotal(3); // loading cruise + loading fishing operationIds + export
- setProgressionModel(pm);
-
- // export catches
- CatchesSumatraExportServiceV2 service =
- getContext().getCatchesSumatraExportServiceV2();
- service.exportFishingOperationForSumatra(file,
- cruise.getId(),
- fishingOperation.getId(),
- pm);
-
- }
-
- @Override
- public void postSuccessAction() {
- super.postSuccessAction();
- sendMessage(t("tutti.exportFishingOperationForSumatraV2.action.success", file));
- }
-}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2014-05-20 14:35:16 UTC (rev 1793)
@@ -105,7 +105,7 @@
}
#editCruiseComboBox {
- model: {handler.newComboModel(editCruiseButton, exportCruiseButton, sendCruiseReportButton, exportCruiseForSumatraButton, exportCruiseForSumatraV2Button)};
+ model: {handler.newComboModel(editCruiseButton, exportCruiseButton, sendCruiseReportButton, exportCruiseForSumatraButton)};
enabled: {model.isProgramFound() && model.isCruiseFound()};
renderer: {new ActionListCellRenderer()};
}
@@ -143,14 +143,6 @@
_help: {"tutti.selectCruise.action.exportCruiseForSumatra.help"};
}
-#exportCruiseForSumatraV2Button {
- actionIcon: export;
- text: "tutti.selectCruise.action.exportCruiseForSumatraV2";
- toolTipText: "tutti.selectCruise.action.exportCruiseForSumatraV2.tip";
- _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportCruiseForSumatraV2Action.class};
- _help: {"tutti.selectCruise.action.exportCruiseForSumatraV2.help"};
-}
-
#newCruiseButton {
actionIcon: add;
text: "tutti.selectCruise.action.newCruise";
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-05-20 14:35:16 UTC (rev 1793)
@@ -69,7 +69,6 @@
<JButton id='exportCruiseButton'/>
<JButton id='sendCruiseReportButton'/>
<JButton id='exportCruiseForSumatraButton'/>
- <JButton id='exportCruiseForSumatraV2Button'/>
<JButton id='newProtocolButton'/>
<JButton id='importProtocolButton'/>
<JButton id='editProtocolButton'/>
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-05-20 14:35:16 UTC (rev 1793)
@@ -362,15 +362,6 @@
_help: {"tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help"};
}
-#exportFishingOperationReportForSumatraV2Button {
- actionIcon: export;
- text: "tutti.editCatchBatch.action.exportFishingOperationReportForSumatraV2";
- toolTipText: "tutti.editCatchBatch.action.exportFishingOperationReportForSumatraV2.tip";
- i18nMnemonic: "tutti.editCatchBatch.action.exportFishingOperationReportForSumatraV2.mnemonic";
- _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportFishingOperationForSumatraV2Action.class};
- _help: {"tutti.editCatchBatch.action.exportFishingOperationReportForSumatraV2.help"};
-}
-
#saveButton {
actionIcon: save;
text: "tutti.editCatchBatch.action.saveCatchBatch";
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-05-20 14:35:16 UTC (rev 1793)
@@ -104,7 +104,6 @@
<JToolBar id='catchesCaracteristicsTabToolBar'>
<JButton id='exportFishingOperationReportButton'/>
<JButton id='exportFishingOperationReportForSumatraButton'/>
- <JButton id='exportFishingOperationReportForSumatraV2Button'/>
<ButtonAttachment id='catchesCaracteristicsAttachmentsButton'
constructorParams='getHandler().getContext(), getModel()'/>
</JToolBar>
Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-05-20 14:35:16 UTC (rev 1793)
@@ -1144,9 +1144,15 @@
tutti.exportDb.step.reloadApplication=
tutti.exportFishingOperationForSumatra.action.chooseFile=
tutti.exportFishingOperationForSumatra.action.success=
+tutti.exportFishingOperationForSumatra.message.badBenthos=
+tutti.exportFishingOperationForSumatra.message.badSpecies=
tutti.exportFishingOperationForSumatra.message.model.modified=Catch was modified, please save it before launching an export.
+tutti.exportFishingOperationForSumatra.message.required.protocol=
+tutti.exportFishingOperationForSumatra.title.badBenthos=
+tutti.exportFishingOperationForSumatra.title.badSpecies=
tutti.exportFishingOperationForSumatra.title.choose.exportFile=
tutti.exportFishingOperationForSumatra.title.model.modified=Can't export, catch is modified
+tutti.exportFishingOperationForSumatra.title.required.protocol=
tutti.exportFishingOperationForSumatraV2.action.chooseFile=
tutti.exportFishingOperationForSumatraV2.action.success=
tutti.exportFishingOperationForSumatraV2.message.model.modified=
Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-05-20 13:40:25 UTC (rev 1792)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-05-20 14:35:16 UTC (rev 1793)
@@ -537,12 +537,9 @@
tutti.editCatchBatch.action.exportFishingOperationReport=Résumé PDF
tutti.editCatchBatch.action.exportFishingOperationReport.mnemonic=P
tutti.editCatchBatch.action.exportFishingOperationReport.tip=Envoyer le résumé au format pdf du trait sélectionné
-tutti.editCatchBatch.action.exportFishingOperationReportForSumatra=Résumé Sumatra
+tutti.editCatchBatch.action.exportFishingOperationReportForSumatra=Résumé Csv
tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.mnemonic=u
-tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.tip=Exporter le trait sélectionnée pour Sumatra (au format csv)
-tutti.editCatchBatch.action.exportFishingOperationReportForSumatraV2=Résumé Sumatra V2
-tutti.editCatchBatch.action.exportFishingOperationReportForSumatraV2.mnemonic=m
-tutti.editCatchBatch.action.exportFishingOperationReportForSumatraV2.tip=Exporter le trait sélectionnée pour Sumatra V2 (au format csv)
+tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.tip=Exporter le résumé au format csv du trait sélectionnée
tutti.editCatchBatch.action.saveCatchBatch=Enregistrer
tutti.editCatchBatch.action.saveCatchBatch.mnemonic=S
tutti.editCatchBatch.action.saveCatchBatch.tip=Enregistrer la capture
@@ -1119,28 +1116,26 @@
tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>.
tutti.exportCruiseForSumatra.action.chooseFile=Choisir le fichier d'export
tutti.exportCruiseForSumatra.action.success=La campagne sélectionnée a été exportée dans le fichier <strong>%s</strong>
+tutti.exportCruiseForSumatra.message.required.protocol=Pour faire un export csv, un protocol est requis.<br/>De plus toutes les espèces de la captures doivent être renseignées dans le protocole.
tutti.exportCruiseForSumatra.title.choose.exportFile=Exporter la campagne
-tutti.exportCruiseForSumatraV2.action.chooseFile=Choisir le fichier d'export
-tutti.exportCruiseForSumatraV2.action.success=La campagne sélectionnée a été exportée dans le fichier <strong>%s</strong>
-tutti.exportCruiseForSumatraV2.message.required.protocol=Pour faire un export sumatra v2, un protocol est requis.<br/>De plus toutes les espèces de la captures doivent être renseignées dans le protocole.
-tutti.exportCruiseForSumatraV2.title.choose.exportFile=Exporter la campagne
-tutti.exportCruiseForSumatraV2.title.required.protocol=Protocole requis pour export sumatra v2
+tutti.exportCruiseForSumatra.title.required.protocol=Protocole requis pour export csv
+tutti.exportCruiseForSumatraV2.message.required.protocol=
+tutti.exportCruiseForSumatraV2.title.required.protocol=
tutti.exportDb.step.closeDb=Fermeture de la base courante
tutti.exportDb.step.createArchive=Création de l'archive %s
tutti.exportDb.step.openDb=Réouverture de la base courante
tutti.exportDb.step.reloadApplication=Redémarrage de l'application
tutti.exportFishingOperationForSumatra.action.chooseFile=Choisir le fichier d'export
tutti.exportFishingOperationForSumatra.action.success=Le trait a été exporté dans le fichier <strong>%s</strong>
+tutti.exportFishingOperationForSumatra.message.badBenthos=<html><body>Des espèces non présentes (ou avec un code campagne non renseigné) dans le protocole (onglet Benthos) ont été détectées \: <ul>%s</ul></body></html>
+tutti.exportFishingOperationForSumatra.message.badSpecies=<html><body>Des espèces non présentes (ou avec un code campagne non renseigné) dans le protocole (onglet Espèce) ont été détectées \: <ul>%s</ul></body></html>
tutti.exportFishingOperationForSumatra.message.model.modified=La capture a été modifiée, veuillez l'enregistrer avant de lancer un export.
+tutti.exportFishingOperationForSumatra.message.required.protocol=<html><body>Pour faire un export csv, un protocol est requis.<br/>De plus toutes les espèces de la captures doivent être renseignées dans le protocole.</body></html>
+tutti.exportFishingOperationForSumatra.title.badBenthos=Espèces non présentes dans le protocole (onglet Benthos)
+tutti.exportFishingOperationForSumatra.title.badSpecies=Espèces non présentes dans le protocole (onglet Espèce)
tutti.exportFishingOperationForSumatra.title.choose.exportFile=Exporter le trait de la campagne
tutti.exportFishingOperationForSumatra.title.model.modified=Impossible d'exporter, capture modifiée
-tutti.exportFishingOperationForSumatraV2.action.chooseFile=Choisir le fichier d'export
-tutti.exportFishingOperationForSumatraV2.action.success=Le trait a été exporté dans le fichier <strong>%s</strong>
-tutti.exportFishingOperationForSumatraV2.message.model.modified=La capture a été modifiée, veuillez l'enregistrer avant de lancer un export.
-tutti.exportFishingOperationForSumatraV2.message.required.protocol=<html><body>Pour faire un export sumatra v2, un protocol est requis.<br/>De plus toutes les espèces de la captures doivent être renseignées dans le protocole.</body></html>
-tutti.exportFishingOperationForSumatraV2.title.choose.exportFile=Exporter le trait de la campagne
-tutti.exportFishingOperationForSumatraV2.title.model.modified=Impossible d'exporter, capture modifiée
-tutti.exportFishingOperationForSumatraV2.title.required.protocol=Protocole requis pour export sumatra v2
+tutti.exportFishingOperationForSumatra.title.required.protocol=Protocole requis pour export csv
tutti.exportFishingOperationReport.action.chooseFile=Choisir le fichier de rapport
tutti.exportFishingOperationReport.action.success=Le trait a été exporté dans le fichier <strong>%s</strong>
tutti.exportFishingOperationReport.message.model.modified=La capture a été modifiée, veuillez l'enregistrer avant de lancer un export.
@@ -1449,10 +1444,8 @@
tutti.selectCruise.action.editProtocol.tip=Éditer le protocole sélectionné
tutti.selectCruise.action.exportCruise=Export Générique
tutti.selectCruise.action.exportCruise.tip=Exporter la campagne sélectionnée au format générique
-tutti.selectCruise.action.exportCruiseForSumatra=Eport Sumatra (v1)
-tutti.selectCruise.action.exportCruiseForSumatra.tip=Exporter la campagne sélectionnée au format csv pour Sumatra (v1)
-tutti.selectCruise.action.exportCruiseForSumatraV2=Export Sumatra (V2)
-tutti.selectCruise.action.exportCruiseForSumatraV2.tip=Exporter la campagne sélectionnée au format csv pour Sumatra (V2)
+tutti.selectCruise.action.exportCruiseForSumatra=Eport csv
+tutti.selectCruise.action.exportCruiseForSumatra.tip=Exporter la campagne sélectionnée au format csv
tutti.selectCruise.action.exportProgram=Exporter
tutti.selectCruise.action.exportProgram.tip=Exporter la série sélectionnée
tutti.selectCruise.action.exportProtocol=Exporter
1
0