From tchemit@users.forge.codelutin.com Thu Jun 13 16:11:04 2013
From: tchemit@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r1110 -
	trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
Date: Thu, 13 Jun 2013 16:11:04 +0200
Message-ID: <20130613141104.1E798187A2D@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2196240522356397520=="

--===============2196240522356397520==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2013-06-13 16:11:03 +0200 (Thu, 13 Jun 2013)
New Revision: 1110

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1110

Log:
refs #2711: [EXPORT GENERIQUE] points ?\195?\160 am?\195?\169liorer (utilisat=
ion decoratuer sur navire)

Modified:
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/Accident=
alCatchExportModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExp=
ortModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/Individu=
alObservationExportModel.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineLi=
tterExportModel.java

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/A=
ccidentalCatchExportModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/Acciden=
talCatchExportModel.java	2013-06-13 10:16:24 UTC (rev 1109)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/Acciden=
talCatchExportModel.java	2013-06-13 14:11:03 UTC (rev 1110)
@@ -78,7 +78,7 @@
         newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION=
_NUMBER);
         newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FIS=
HING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER);
         newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGRE=
GATION);
-        newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY=
_NAME);
+        newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VE=
SSEL_VALUE_FORMATTER);
=20
         newColumnForExport("BatchId", AccidentalCatchExportRow.PROPERTY_BATC=
H_ID, TuttiCsvUtil.PRIMITIVE_INTEGER);
         newColumnForExport("ReferenceTaxonId", AccidentalBatch.PROPERTY_SPEC=
IES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.PRIMITIVE_INTEG=
ER);

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/C=
atchExportModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchEx=
portModel.java	2013-06-13 10:16:24 UTC (rev 1109)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchEx=
portModel.java	2013-06-13 14:11:03 UTC (rev 1110)
@@ -69,7 +69,7 @@
         newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION=
_NUMBER);
         newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FIS=
HING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER);
         newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGRE=
GATION);
-        newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY=
_NAME);
+        newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VE=
SSEL_VALUE_FORMATTER);
         newColumnForExport("Taxon", SpeciesBatch.PROPERTY_SPECIES + "." + Sp=
ecies.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.INTEGER);
=20
         for (SampleCategoryEnum sampleCategoryEnum : samplingOrder) {

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/I=
ndividualObservationExportModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/Individ=
ualObservationExportModel.java	2013-06-13 10:16:24 UTC (rev 1109)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/Individ=
ualObservationExportModel.java	2013-06-13 14:11:03 UTC (rev 1110)
@@ -78,7 +78,7 @@
         newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION=
_NUMBER);
         newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FIS=
HING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER);
         newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGRE=
GATION);
-        newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY=
_NAME);
+        newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VE=
SSEL_VALUE_FORMATTER);
=20
         newColumnForExport("BatchId", IndividualObservationExportRow.PROPERT=
Y_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER);
         newColumnForExport("ReferenceTaxonId", IndividualObservationBatch.PR=
OPERTY_SPECIES + "." + Species.PROPERTY_REFERENCE_TAXON_ID, TuttiCsvUtil.PRIM=
ITIVE_INTEGER);

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/M=
arineLitterExportModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineL=
itterExportModel.java	2013-06-13 10:16:24 UTC (rev 1109)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/MarineL=
itterExportModel.java	2013-06-13 14:11:03 UTC (rev 1110)
@@ -55,7 +55,7 @@
         newColumnForExport("Id_Operation", FishingOperation.PROPERTY_STATION=
_NUMBER);
         newColumnForExport("NumOrdre_Station", FishingOperation.PROPERTY_FIS=
HING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER);
         newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGRE=
GATION);
-        newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, Vessel.PROPERTY=
_NAME);
+        newColumnForExport("Navire", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VE=
SSEL_VALUE_FORMATTER);
=20
         newColumnForExport("MarineLitterCategory", MarineLitterBatch.PROPERT=
Y_MARINE_LITTER_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER);
         newColumnForExport("MarineLitterSizeCategory", MarineLitterBatch.PRO=
PERTY_MARINE_LITTER_SIZE_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER=
);


--===============2196240522356397520==--


