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

r1093 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/export test/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: tchemit Date: 2013-06-10 17:04:25 +0200 (Mon, 10 Jun 2013) New Revision: 1093 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1093 Log: refs #2693: [EXPORT GENERIQUE] lot uniquement avec un nombre d'individus : la valeur du nombre n'est pas dans l'export catch.csv Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 14:45:01 UTC (rev 1092) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 15:04:25 UTC (rev 1093) @@ -76,7 +76,7 @@ switch (sampleCategoryEnum) { case sortedUnsorted: - addSampleCategory("VracHorVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + addSampleCategory("VracHorsVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); break; case size: addSampleCategory("Cat_Tri", CatchExportRow.SIZE_SAMPLE_CATEGORY); @@ -101,7 +101,7 @@ newNullableColumnForExport("Poids_Classe_Taille", CatchExportRow.FREQUENCY_WEIGHT, TuttiCsvUtil.FLOAT); newNullableColumnForExport("Unite_Taille", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC + "." + Caracteristic.PROPERTY_UNIT); newNullableColumnForExport("Precision_Mesure", CatchExportRow.FREQUENCY_LENGTH_STEP_CARACTERISTIC + "." + Caracteristic.PROPERTY_PRECISION, TuttiCsvUtil.FLOAT); - newNullableColumnForExport("Nbr", CatchExportRow.FREQUENCY_NUMBER, TuttiCsvUtil.INTEGER); + newNullableColumnForExport("Nbr", CatchExportRow.BATCH_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poids_Reference", CatchExportRow.REFERENCE_WEIGHT, TuttiCsvUtil.PRIMITIVE_FLOAT); newColumnForExport("Coef_Final_Elevation", CatchExportRow.RAISING_FACTOR, TuttiCsvUtil.PRIMITIVE_FLOAT); @@ -168,7 +168,7 @@ speciesBatch.getSampleCategoryComputedWeight(), speciesBatch.getWeight(), speciesBatch.getNumber(), - speciesBatch.getComputedNumber(), +// speciesBatch.getComputedNumber(), speciesBatch.getRankOrder()); if (speciesBatch.isChildBatchsEmpty()) { @@ -259,7 +259,7 @@ speciesBatch.getSampleCategoryComputedWeight(), speciesBatch.getWeight(), speciesBatch.getNumber(), - speciesBatch.getComputedNumber(), +// speciesBatch.getComputedNumber(), speciesBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); @@ -281,7 +281,7 @@ benthosBatch.getSampleCategoryComputedWeight(), benthosBatch.getWeight(), benthosBatch.getNumber(), - benthosBatch.getComputedNumber(), +// benthosBatch.getComputedNumber(), benthosBatch.getRankOrder()); if (benthosBatch.isChildBatchsEmpty()) { @@ -372,7 +372,7 @@ benthosBatch.getSampleCategoryComputedWeight(), benthosBatch.getWeight(), benthosBatch.getNumber(), - benthosBatch.getComputedNumber(), +// benthosBatch.getComputedNumber(), benthosBatch.getRankOrder()); CatchExportRow row = currentRow.copy(); @@ -396,9 +396,11 @@ Float sampleCategoryComputedWeight, Float batchWeight, Integer batchNumber, - Integer batchComputedNumber, +// Integer batchComputedNumber, Integer batchRankOrder ) { + currentRow.setBatchNumber(batchNumber); + ExportSampleCategory<Serializable> sampleCategory = new ExportSampleCategory<Serializable>(); Caracteristic caracteristic = sampleCategoryToCaracteristics.get(sampleCategoryType); @@ -409,8 +411,7 @@ sampleCategory.setSampleWeight(batchWeight); sampleCategory.setComputedWeight(sampleCategoryComputedWeight); - sampleCategory.setNumber(batchNumber); - sampleCategory.setComputedNumber(batchComputedNumber); +// sampleCategory.setComputedNumber(batchComputedNumber); sampleCategory.setWeightOrVolType(WEIGHT_OR_VOL_TYPE); sampleCategory.setRankOrder(batchRankOrder); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java 2013-06-10 14:45:01 UTC (rev 1092) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportRow.java 2013-06-10 15:04:25 UTC (rev 1093) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.Cruise; @@ -73,6 +74,8 @@ public static final String RAISING_FACTOR = "raisingFactor"; + public static final String BATCH_NUMBER = "batchNumber"; + protected Cruise cruise; protected FishingOperation fishingOperation; @@ -88,8 +91,11 @@ protected Species species; protected float referenceWeight; + protected float raisingFactor; + protected Integer batchNumber; + public void setCruise(Cruise cruise) { this.cruise = cruise; } @@ -110,16 +116,24 @@ this.raisingFactor = raisingFactor; } + public void setBatchNumber(Integer batchNumber) { + this.batchNumber = batchNumber; + } + public void addCategory(ExportSampleCategory sampleCategory) { categories.put(sampleCategory.getCategoryType(), sampleCategory); } public void setSpeciesFrequency(SpeciesBatchFrequency speciesFrequency) { + Preconditions.checkNotNull(speciesFrequency); this.speciesFrequency = speciesFrequency; + this.batchNumber = speciesFrequency.getNumber(); } public void setBenthosFrequency(BenthosBatchFrequency benthosFrequency) { + Preconditions.checkNotNull(benthosFrequency); this.benthosFrequency = benthosFrequency; + this.batchNumber = benthosFrequency.getNumber(); } public Date getBeginDate() { @@ -198,17 +212,26 @@ return raisingFactor; } + public Integer getBatchNumber() { + return batchNumber; + } + public CatchExportRow copy() { CatchExportRow result = new CatchExportRow(); result.setCruise(cruise); result.setFishingOperation(fishingOperation); result.setSpeciesCategory(speciesCategory); result.categories.putAll(categories); - result.setBenthosFrequency(benthosFrequency); - result.setSpeciesFrequency(speciesFrequency); + if (benthosFrequency != null) { + result.setBenthosFrequency(benthosFrequency); + } + if (speciesFrequency != null) { + result.setSpeciesFrequency(speciesFrequency); + } result.setSpecies(species); result.setRaisingFactor(raisingFactor); result.setReferenceWeight(referenceWeight); + result.setBatchNumber(batchNumber); return result; } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java 2013-06-10 14:45:01 UTC (rev 1092) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportSampleCategory.java 2013-06-10 15:04:25 UTC (rev 1093) @@ -58,10 +58,10 @@ public static final String PROPERTY_SAMPLE_WEIGHT = "sampleWeight"; - private Integer number; +// private Integer number; +// +// private Integer computedNumber; - private Integer computedNumber; - private Integer rankOrder; private String weightOrVolType; @@ -70,22 +70,22 @@ private Caracteristic categoryCaracteristic; - public Integer getNumber() { - return number; - } +// public Integer getNumber() { +// return number; +// } +// +// public void setNumber(Integer number) { +// this.number = number; +// } +// +// public Integer getComputedNumber() { +// return computedNumber; +// } +// +// public void setComputedNumber(Integer computedNumber) { +// this.computedNumber = computedNumber; +// } - public void setNumber(Integer number) { - this.number = number; - } - - public Integer getComputedNumber() { - return computedNumber; - } - - public void setComputedNumber(Integer computedNumber) { - this.computedNumber = computedNumber; - } - public String getWeightOrVolType() { return weightOrVolType; } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-10 14:45:01 UTC (rev 1092) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-06-10 15:04:25 UTC (rev 1093) @@ -95,7 +95,7 @@ "2013;Campagne CGFS;;A;2;308;Nombre d'engin - engin - totale - Déclaration d'un professionnel;2.0;"; public static final String CATCH_CONTENT = - "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;Taxon;Vrac;Num_Ordre_Vrac_H2;Tot_Vrac;Ech_Vrac;Type_Volume_Poids_Vrac;Unite_Volume_Poids_Vrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_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;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" + + "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;Taxon;VracHorsVrac;Num_Ordre_VracHorsVrac_H2;Tot_VracHorsVrac;Ech_VracHorsVrac;Type_Volume_Poids_VracHorsVrac;Unite_Volume_Poids_VracHorsVrac;Cat_Tri;Num_Ordre_Cat_Tri_H2;Tot_Cat_Tri;Ech_Cat_Tri;Type_Volume_Poids_Cat_Tri;Unite_Volume_Poids_Cat_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;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Final_Elevation\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.0;1;;cm;0.5;5;5.0;500.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;10.5;2;;cm;0.5;2;5.0;500.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Mâle;1;30.0;;Poids;;1 - Stade 1;1;10.0;5.0;Poids;;NA;;;;;;307;11.0;3;;cm;0.5;1;5.0;500.0;\n" + @@ -104,7 +104,7 @@ "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;11.0;2;;cm;;6;30.0;3000.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;G - Gros;1;80.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;1425;12.0;3;;cm;;7;30.0;3000.0;\n" + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Vrac;1;100.0;;Poids;;M - Moyen;2;20.0;;Poids;;Femelle;2;50.0;30.0;Poids;;3 - Stade 3;3;10.0;;Poids;;NA;;;;;;;;;;;;;20.0;2000.0;\n" + - "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;;20.0;1.0;"; + "2013;Campagne CGFS;;GOV 19.7/25.9;1;A;1;GWEN DREZ;11242;Hors Vrac;1;20.0;;Poids;;NA;;;;;;NA;;;;;;NA;;;;;;NA;;;;;;;;;;;;2;20.0;1.0;"; public static final String MARINE_LITTER_CONTENT = "Annee;Serie;Serie_Partielle;Engin;Poche;Id_Operation;NumOrdre_Station;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Comment;TotalWeight\n" +

1 0

r1092 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service/catches/multipost resources/i18n
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 16:45:01 +0200 (Mon, 10 Jun 2013) New Revision: 1092 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1092 Log: fixes #2615 [IMP/EXP] - Import/Export multi-postes : pas de contr?\195?\180le sur l'ID op?\195?\169ration Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.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 Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRow.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -0,0 +1,58 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import java.util.Date; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3.1 + */ +public abstract class AbstractFishingOperationRow { + + public static final String STATION_NUMBER = "stationNumber"; + + public static final String OPERATION_NUMBER = "operationNumber"; + + public static final String MULTIRIG_AGGREGATION = "multirigAggregation"; + + public static final String DATE = "date"; + + protected String stationNumber; + + protected Integer operationNumber; + + protected String multirigAggregation; + + protected Date date; + + public String getStationNumber() { + return stationNumber; + } + + public void setStationNumber(String stationNumber) { + this.stationNumber = stationNumber; + } + + public Integer getOperationNumber() { + return operationNumber; + } + + public void setOperationNumber(Integer operationNumber) { + this.operationNumber = operationNumber; + } + + public String getMultirigAggregation() { + return multirigAggregation; + } + + public void setMultirigAggregation(String multirigAggregation) { + this.multirigAggregation = multirigAggregation; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } +} Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AbstractFishingOperationRowModel.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -0,0 +1,20 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3.1 + */ +public abstract class AbstractFishingOperationRowModel<FO extends AbstractFishingOperationRow> + extends TuttiCsvUtil.AbstractTuttiImportExportModel<FO> { + + public AbstractFishingOperationRowModel(char separator) { + super(separator); + + newColumnForImportExport(FishingOperationRow.STATION_NUMBER); + newColumnForImportExport(FishingOperationRow.OPERATION_NUMBER, TuttiCsvUtil.INTEGER); + newColumnForImportExport(FishingOperationRow.MULTIRIG_AGGREGATION); + newColumnForImportExport(FishingOperationRow.DATE, TuttiCsvUtil.DAY_TIME); + } +} Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRow.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -28,7 +28,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 */ -public class CatchWeightsRow { +public class CatchWeightsRow extends AbstractFishingOperationRow { public static final String TOTAL_SORTED_WEIGHT = "totalSortedWeight"; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchWeightsRowModel.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -30,7 +30,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 */ -public class CatchWeightsRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<CatchWeightsRow> { +public class CatchWeightsRowModel extends AbstractFishingOperationRowModel<CatchWeightsRow> { public CatchWeightsRowModel(char separator) { super(separator); Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRow.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -0,0 +1,10 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import java.util.Date; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3.1 + */ +public class FishingOperationRow extends AbstractFishingOperationRow { +} Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/FishingOperationRowModel.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -0,0 +1,19 @@ +package fr.ifremer.tutti.service.catches.multipost; + +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.3.1 + */ +public class FishingOperationRowModel extends AbstractFishingOperationRowModel<FishingOperationRow> { + + public FishingOperationRowModel(char separator) { + super(separator); + } + + @Override + public FishingOperationRow newEmptyInstance() { + return new FishingOperationRow(); + } +} Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRow.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -28,7 +28,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 */ -public class MarineLitterWeightRow { +public class MarineLitterWeightRow extends AbstractFishingOperationRow { public static final String TOTAL_WEIGHT = "totalWeight"; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MarineLitterWeightRowModel.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -30,7 +30,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 2.3 */ -public class MarineLitterWeightRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<MarineLitterWeightRow> { +public class MarineLitterWeightRowModel extends AbstractFishingOperationRowModel<MarineLitterWeightRow> { public MarineLitterWeightRowModel(char separator) { super(separator); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 14:45:01 UTC (rev 1092) @@ -31,6 +31,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; @@ -46,6 +47,7 @@ import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.TuttiServiceContext; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -158,6 +160,7 @@ weights.setTotalSortedWeight(catchBatch.getSpeciesTotalSortedWeight()); weights.setInertWeight(catchBatch.getSpeciesTotalInertWeight()); weights.setLivingNotItemizedWeight(catchBatch.getSpeciesTotalLivingNotItemizedWeight()); + exportOperation(weights, operation); exportCatches(file, SPECIES_FILE, weights, rows, frequencyRows, attachmentRows); } @@ -191,6 +194,7 @@ weights.setTotalSortedWeight(catchBatch.getBenthosTotalSortedWeight()); weights.setInertWeight(catchBatch.getBenthosTotalInertWeight()); weights.setLivingNotItemizedWeight(catchBatch.getBenthosTotalLivingNotItemizedWeight()); + exportOperation(weights, operation); exportCatches(file, BENTHOS_FILE, weights, rows, frequencyRows, attachmentRows); } @@ -253,6 +257,7 @@ CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operationId); MarineLitterWeightRow weight = new MarineLitterWeightRow(); weight.setTotalWeight(catchBatch.getMarineLitterTotalWeight()); + exportOperation(weight, operation); MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); @@ -358,6 +363,25 @@ IOUtils.closeQuietly(writer); } + // export operation + FishingOperationRow foRow = new FishingOperationRow(); + exportOperation(foRow, operation); + + FishingOperationRowModel foRowModel = new FishingOperationRowModel(csvSeparator); + + File weightFile = new File(directory, WEIGHTS_FILE); + file2zip.add(weightFile); + try { + writer = Files.newWriter(weightFile, Charsets.UTF_8); + Export export = Export.newExport(foRowModel, Lists.newArrayList(foRow)); + export.write(writer); + writer.close(); + } catch (Exception e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.export.operation.error", weightFile), e); + } finally { + IOUtils.closeQuietly(writer); + } + exportAttachments(directory, file2zip, attachmentRows); try { @@ -446,6 +470,25 @@ IOUtils.closeQuietly(writer); } + // export operation + FishingOperationRow foRow = new FishingOperationRow(); + exportOperation(foRow, operation); + + FishingOperationRowModel foRowModel = new FishingOperationRowModel(csvSeparator); + + File weightFile = new File(directory, WEIGHTS_FILE); + file2zip.add(weightFile); + try { + writer = Files.newWriter(weightFile, Charsets.UTF_8); + Export export = Export.newExport(foRowModel, Lists.newArrayList(foRow)); + export.write(writer); + writer.close(); + } catch (Exception e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.export.operation.error", weightFile), e); + } finally { + IOUtils.closeQuietly(writer); + } + exportAttachments(directory, file2zip, attachmentRows); try { @@ -489,6 +532,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); + checkSameOperation(tempDir, weightsModel, operation); + // Import batches File speciesFile = new File(tempDir, SPECIES_FILE); @@ -578,7 +625,7 @@ } CatchFrequencyRowModel frequencyModel = new CatchFrequencyRowModel(csvSeparator, - dataContext.getLengthStepCaracteristics()); + dataContext.getCaracteristics()); Import<CatchFrequencyRow> frequencyImporter = Import.newImport(frequencyModel, reader); @@ -628,7 +675,6 @@ throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); } - CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); Import<CatchWeightsRow> weights = Import.newImport(weightsModel, reader); Iterator<CatchWeightsRow> iterator = weights.iterator(); @@ -695,6 +741,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); + checkSameOperation(tempDir, weightsModel, operation); + // Import batches File benthosFile = new File(tempDir, BENTHOS_FILE); @@ -784,7 +834,7 @@ } CatchFrequencyRowModel frequencyModel = new CatchFrequencyRowModel(csvSeparator, - dataContext.getLengthStepCaracteristics()); + dataContext.getCaracteristics()); Import<CatchFrequencyRow> frequencyImporter = Import.newImport(frequencyModel, reader); @@ -834,7 +884,6 @@ throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); } - CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); Import<CatchWeightsRow> weights = Import.newImport(weightsModel, reader); Iterator<CatchWeightsRow> iterator = weights.iterator(); @@ -901,6 +950,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); + checkSameOperation(tempDir, weightModel, operation); + // Import batches File marineLitterFile = new File(tempDir, MARINE_LITTER_FILE); @@ -985,7 +1038,6 @@ throw new TuttiTechnicalException(_("tutti.service.multipost.import.weights.error", weightsFile), e); } - MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); Import<MarineLitterWeightRow> weight = Import.newImport(weightModel, reader); Iterator<MarineLitterWeightRow> iterator = weight.iterator(); @@ -1028,6 +1080,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + FishingOperationRowModel operationModel = new FishingOperationRowModel(csvSeparator); + checkSameOperation(tempDir, operationModel, operation); + // Import batches File observationFile = new File(tempDir, INDIVIDUAL_OBSERVATION_FILE); @@ -1140,6 +1196,10 @@ new AllFileSelector(), _("tutti.service.multipost.explodeArchive.error", file)); + //check operation + FishingOperationRowModel operationModel = new FishingOperationRowModel(csvSeparator); + checkSameOperation(tempDir, operationModel, operation); + // Import batches File accidentalFile = new File(tempDir, ACCIDENTAL_CATCHES_FILE); @@ -1397,6 +1457,13 @@ } } + protected void exportOperation(AbstractFishingOperationRow afoRow, FishingOperation operation) { + afoRow.setStationNumber(operation.getStationNumber()); + afoRow.setOperationNumber(operation.getFishingOperationNumber()); + afoRow.setMultirigAggregation(operation.getMultirigAggregation()); + afoRow.setDate(operation.getGearShootingStartDate()); + } + protected void exportAttachments(File directory, List<File> file2zip, List<AttachmentRow> attachmentRows) { AttachmentRowModel csvAttachmentModel = new AttachmentRowModel(csvSeparator); @@ -1536,4 +1603,34 @@ } } } + + protected void checkSameOperation(File directory, + AbstractFishingOperationRowModel fishingOperationRowModel, + FishingOperation operation) { + File operationFile = new File(directory, WEIGHTS_FILE); + Reader reader; + + try { + reader = Files.newReader(operationFile, Charsets.UTF_8); + + } catch (FileNotFoundException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.import.operation.error", operationFile), e); + } + + Import<AbstractFishingOperationRow> fishingOperationImporter = Import.newImport(fishingOperationRowModel, reader); + + Iterator<AbstractFishingOperationRow> iterator = fishingOperationImporter.iterator(); + if (iterator.hasNext()) { + AbstractFishingOperationRow row = iterator.next(); + if (ObjectUtils.notEqual(row.getStationNumber(), operation.getStationNumber()) + || ObjectUtils.notEqual(row.getOperationNumber(), operation.getFishingOperationNumber()) + || ObjectUtils.notEqual(row.getMultirigAggregation(), operation.getMultirigAggregation()) + || ObjectUtils.notEqual(row.getDate(), operation.getGearShootingStartDate())) { + + throw new TuttiBusinessException(_("tutti.service.multipost.import.wrongOperation.error", + decoratorService.getDecoratorByType(FishingOperation.class) + .toString(operation))); + } + } + } } 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 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-10 14:45:01 UTC (rev 1092) @@ -93,6 +93,7 @@ tutti.service.multipost.export.deleteTempDirectory.error= tutti.service.multipost.export.error= tutti.service.multipost.export.frequencies.error= +tutti.service.multipost.export.operation.error= tutti.service.multipost.export.species.error= tutti.service.multipost.export.weight.error= tutti.service.multipost.export.weights.error= @@ -100,8 +101,10 @@ tutti.service.multipost.import.batches.error= tutti.service.multipost.import.caracteristics.error= tutti.service.multipost.import.frequencies.error= +tutti.service.multipost.import.operation.error= tutti.service.multipost.import.species.error= tutti.service.multipost.import.weights.error= +tutti.service.multipost.import.wrongOperation.error= tutti.service.multipost.resolveArchive.error= tutti.service.operations.accidental.error.species.required= tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight= 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 2013-06-10 13:40:13 UTC (rev 1091) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 14:45:01 UTC (rev 1092) @@ -90,13 +90,16 @@ tutti.service.multipost.export.deleteTempDirectory.error=Erreur lors de la suppression du dossier temporaire tutti.service.multipost.export.error=Erreur lors de la création du fichier d'export tutti.service.multipost.export.frequencies.error=Erreur lors de l'export des mensurations +tutti.service.multipost.export.operation.error=Erreur lors de l'export des données du trait tutti.service.multipost.export.weight.error=Erreur lors de l'export des poids tutti.service.multipost.export.weights.error=Erreur lors de l'export des poids tutti.service.multipost.import.attachments.error=Erreur lors de l'import des pièces-jointes tutti.service.multipost.import.batches.error=Erreur lors de l'import des lots tutti.service.multipost.import.caracteristics.error=Erreur lors de l'import des caractéristiques tutti.service.multipost.import.frequencies.error=Erreur lors de l'import des mensurations +tutti.service.multipost.import.operation.error=Erreur lors de l'import des données du trait tutti.service.multipost.import.weights.error=Erreur lors de l'import des poids +tutti.service.multipost.import.wrongOperation.error=Opération est impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre trait : %s tutti.service.multipost.resolveArchive.error=Erreur lors de l'ouverture de l'archive tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight=Benthos - Le poids total des mensurations du lot de %s/%s - %s (%skg) est supérieur au poids de la catégorie (%skg) tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight=Benthos - Le poids du lot de %s/%s - %s (%skg) est inférieur à la somme des poids de ses sous-catégories (%skg)

1 0

r1091 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 15:40:13 +0200 (Mon, 10 Jun 2013) New Revision: 1091 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1091 Log: fixes #2613 [TRAIT] saisie des lat long ?\195?\160 36.559 se transforme tout seul en 36.533339 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial/SexagecimalPosition.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial/SexagecimalPosition.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial/SexagecimalPosition.java 2013-06-10 13:16:14 UTC (rev 1090) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/spatial/SexagecimalPosition.java 2013-06-10 13:40:13 UTC (rev 1091) @@ -48,6 +48,8 @@ protected Integer minute; + protected Float decimalMinute; + protected Integer seconde; /** @@ -86,11 +88,27 @@ } /** + * Methode statique de fabrique de position a partir d'une valeur du format + * degre-minute-seconde. + * + * @param d la valeur des degres + * @param dm la valeur des minutes + * @return une nouvelle instance de position convertie + */ + public static SexagecimalPosition valueOf(boolean sign, int d, Float dm) { + SexagecimalPosition r = new SexagecimalPosition(); + r.setSign(sign); + r.setDegre(d); + r.setMinuteDecimale(dm); + return r; + } + + /** * @return {@code true} si aucune composante n'est renseigné, * {@code false} autrement. */ public boolean isNull() { - return degre == null && minute == null && seconde == null; + return degre == null && minute == null && decimalMinute == null && seconde == null; } /** @@ -105,6 +123,7 @@ public void update(Float decimal) { Integer d = null; Integer m = null; + Float dm = null; Integer s = null; boolean si = false; if (decimal != null) { @@ -116,8 +135,9 @@ d = (int) (Math.round(decimal + 0.5) - 1); m = 0; s = 0; - decimal = 60 * (decimal - d); + decimal = 60.0f * (decimal - d); if (decimal > 0) { + dm = decimal; m = (int) (Math.round(decimal + 0.5) - 1); decimal = 60 * (decimal - m); if (decimal > 0) { @@ -139,6 +159,7 @@ } degre = d; minute = m; + decimalMinute = dm; seconde = s; sign = si; } @@ -149,17 +170,23 @@ } Integer d = degre == null ? 0 : degre; Integer m = minute == null ? 0 : minute; + Float dm = decimalMinute; Integer s = seconde == null ? 0 : seconde; Float result = Float.valueOf(d); - if (m > 0) { - result += (float) m / 60; - if (s == 0) { - result += 0.5f / 3600; + if (decimalMinute != null) { + result += dm / 60.0f; + + } else { + if (m > 0) { + result += (float) m / 60; + if (s == 0) { + result += 0.5f / 3600; + } } + if (s > 0) { + result += ((float) s + 0.5f) / 3600; + } } - if (s > 0) { - result += ((float) s + 0.5f) / 3600; - } if (sign) { result *= -1; } @@ -175,14 +202,7 @@ } public Float getMinuteDecimale() { - Float minuteDecimale = null; - if (minute != null) { - minuteDecimale = minute.floatValue(); - if (seconde != null) { - minuteDecimale += seconde.floatValue() / 60; - } - } - return minuteDecimale; + return decimalMinute; } public Integer getSeconde() { @@ -202,16 +222,7 @@ } public void setMinuteDecimale(Float minuteDecimale) { - if (minuteDecimale == null) { - minute = null; - seconde = null; - - } else { - Double entier = Math.floor(minuteDecimale); - minute = entier.intValue(); - Double reste = Math.floor((minuteDecimale - entier) * 60); - seconde = reste.intValue(); - } + this.decimalMinute = minuteDecimale; } public void setSeconde(Integer seconde) { @@ -236,6 +247,7 @@ SexagecimalPosition other = (SexagecimalPosition) obj; return sign == other.sign && ObjectUtils.equals(degre, other) && + ObjectUtils.equals(decimalMinute, other.decimalMinute) && ObjectUtils.equals(minute, other.minute) && ObjectUtils.equals(seconde, other.seconde); @@ -252,7 +264,8 @@ hash = 5 * (sign ? 1 : 0); hash = 7 * hash + (degre != null ? degre.hashCode() : 0); hash = 11 * hash + (minute != null ? minute.hashCode() : 0); - hash = 13 * hash + (seconde != null ? seconde.hashCode() : 0); + hash = 13 * hash + (decimalMinute != null ? decimalMinute.hashCode() : 0); + hash = 17 * hash + (seconde != null ? seconde.hashCode() : 0); return hash; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-06-10 13:16:14 UTC (rev 1090) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-06-10 13:40:13 UTC (rev 1091) @@ -255,7 +255,6 @@ showReset: false; useFloat: true; useSign: false; - numberPattern: {DECIMAL2_DIGITS_PATTERN}; } .second {

1 0

r1090 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: tchemit Date: 2013-06-10 15:16:14 +0200 (Mon, 10 Jun 2013) New Revision: 1090 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1090 Log: refs #2693: [EXPORT GENERIQUE] lot uniquement avec un nombre d'individus : la valeur du nombre n'est pas dans l'export catch.csv (renommage de la colonne Vrac) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 09:50:08 UTC (rev 1089) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/CatchExportModel.java 2013-06-10 13:16:14 UTC (rev 1090) @@ -76,7 +76,7 @@ switch (sampleCategoryEnum) { case sortedUnsorted: - addSampleCategory("Vrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); + addSampleCategory("VracHorVrac", CatchExportRow.SORTED_UNSORTED_SAMPLE_CATEGORY); break; case size: addSampleCategory("Cat_Tri", CatchExportRow.SIZE_SAMPLE_CATEGORY);

1 0

Build failed in Jenkins: tutti #893
by admin+hudson＠codelutin.com June 10, 2013

June 10, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/893/changes> Changes: [Kevin Morin] fixes #2689 [ERGO] Erreur de balise sur le libellé du traitement lors de l'export des données ------------------------------------------ Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/tutti/ws/> Updating http://svn.forge.codelutin.com/svn/tutti/trunk at revision '2013-06-10T11:31:00.636 +0200' U tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties At revision 1088 Parsing POMs [trunk] $ /opt/jdk/bin/java -Xmx256m -XX:-UseGCOverheadLimit -cp /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-agent-1.2.jar:/opt/maven3/boot/plexus-classworlds-2.4.2.jar org.jvnet.hudson.maven3.agent.Maven3Main /opt/maven3 /opt/repository/apache-tomcat-7.0.40/webapps/jenkins/WEB-INF/lib/remoting-2.22.jar /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-1.2.jar 55832 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> -U -e clean install java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:331) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:722) Caused by: java.lang.NoClassDefFoundError: org/apache/maven/cli/MavenLoggerManager at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:73) ... 18 more Caused by: java.lang.ClassNotFoundException: org.apache.maven.cli.MavenLoggerManager at org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230) ... 19 more channel stopped ERROR: Failed to parse POMs hudson.util.IOException2: java.lang.reflect.InvocationTargetException at hudson.maven.Maven3Builder.call(Maven3Builder.java:162) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:722) Caused by: java.lang.Exception: java.lang.reflect.InvocationTargetException at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:161) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) ... 10 more Caused by: java.lang.reflect.InvocationTargetException at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:331) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) ... 11 more Caused by: java.lang.NoClassDefFoundError: org/apache/maven/cli/MavenLoggerManager at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:73) ... 18 more Caused by: java.lang.ClassNotFoundException: org.apache.maven.cli.MavenLoggerManager at org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244) at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230) ... 19 more

1 3

r1089 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos marinelitter species
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 11:50:08 +0200 (Mon, 10 Jun 2013) New Revision: 1089 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1089 Log: fixes #2632 [IMP/EXP] - Import/Export multi-postes : message avertissant que certaines donn?\195?\169es ne sont pas import?\195?\169es (alors que tout est import?\195?\169) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -92,31 +92,34 @@ Collection<BenthosBatch> notImportedBenthosBatches = (Collection<BenthosBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT); if (totalSortedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); } Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT); if (inertWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); } Float livingNotItemizedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); if (livingNotItemizedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); } for (BenthosBatch sb : notImportedBenthosBatches) { - batchList.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); + stringBuffer.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editBenthosBatch.action.importMultiPost.success", file)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -91,20 +91,23 @@ Collection<MarineLitterBatch> notImportedMarineLitterBatches = (Collection<MarineLitterBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); if (totalWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); } for (MarineLitterBatch mlb : notImportedMarineLitterBatches) { - batchList.append("- " + decorate(mlb.getMarineLitterCategory()) + " / " + decorate(mlb.getMarineLitterSizeCategory()) + "\n"); + stringBuffer.append("- " + decorate(mlb.getMarineLitterCategory()) + " / " + decorate(mlb.getMarineLitterSizeCategory()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editMarineLitterBatch.action.importMultiPost.success", file)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-06-10 09:16:20 UTC (rev 1088) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-06-10 09:50:08 UTC (rev 1089) @@ -91,31 +91,34 @@ Collection<SpeciesBatch> notImportedSpeciesBatches = (Collection<SpeciesBatch>) notImportedData.get(TuttiMultiPostImportExportService.BATCHES_KEY); - JTextArea batchList = dialog.getBatchList(); - + StringBuffer stringBuffer = new StringBuffer(); Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT); if (totalSortedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); } Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT); if (inertWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); } Float livingNotItemizedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); if (livingNotItemizedWeight != null) { - batchList.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + stringBuffer.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); } for (SpeciesBatch sb : notImportedSpeciesBatches) { - batchList.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); + stringBuffer.append("- " + decorate(sb.getSpecies()) + " / " + decorate(sb.getSampleCategoryValue()) + "\n"); } - dialog.setSize(400, 300); - dialog.setLocationRelativeTo(getContext().getMainUI()); - dialog.setVisible(true); + if (stringBuffer.length() > 0) { + JTextArea batchList = dialog.getBatchList(); + batchList.setText(stringBuffer.toString()); + dialog.setSize(400, 300); + dialog.setLocationRelativeTo(getContext().getMainUI()); + dialog.setVisible(true); + } } sendMessage(_("tutti.editSpeciesBatch.action.importMultiPost.success", file));

1 0

r1088 - trunk/tutti-service/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 11:16:20 +0200 (Mon, 10 Jun 2013) New Revision: 1088 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1088 Log: fixes #2689 [ERGO] Erreur de balise sur le libell?\195?\169 du traitement lors de l'export des donn?\195?\169es Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 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 2013-06-10 08:46:40 UTC (rev 1087) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 09:16:20 UTC (rev 1088) @@ -68,14 +68,14 @@ tutti.service.export.zip.error=Erreur lors de la création du zip d'export %s tutti.service.exportCruise.buildZip=Création de l'archive de l'export (fichier %s) tutti.service.exportCruise.checkCruise=Vérification de la campagne %s -tutti.service.exportCruise.exportAccidentalCatches=Export du fichier accidentalCatch.csv pour la campagne %s -tutti.service.exportCruise.exportCatches=Export du fichier catch.csv pour la campagne %s -tutti.service.exportCruise.exportIndividualObservations=Export du fichier individualObservation.csv pour la campagne %s -tutti.service.exportCruise.exportMarineLitters=Export du fichier marineLitter.csv pour la campagne %s -tutti.service.exportCruise.exportOperations=Export du fichier operations.csv pour la campagne %s -tutti.service.exportCruise.exportParameters=Export du fichier parameters.csv pour la campagne %s -tutti.service.exportCruise.exportSpecies=Export du fichier species.csv pour la campagne %s -tutti.service.exportCruise.exportSurvey=Export du fichier survey.csv pour la campagne %s +tutti.service.exportCruise.exportAccidentalCatches=<html>Export du fichier accidentalCatch.csv pour la campagne %s</html> +tutti.service.exportCruise.exportCatches=<html>Export du fichier catch.csv pour la campagne %s</html> +tutti.service.exportCruise.exportIndividualObservations=<html>Export du fichier individualObservation.csv pour la campagne %s</html> +tutti.service.exportCruise.exportMarineLitters=<html>Export du fichier marineLitter.csv pour la campagne %s</html> +tutti.service.exportCruise.exportOperations=<html>Export du fichier operations.csv pour la campagne %s</html> +tutti.service.exportCruise.exportParameters=<html>Export du fichier parameters.csv pour la campagne %s</html> +tutti.service.exportCruise.exportSpecies=<html>Export du fichier species.csv pour la campagne %s</html> +tutti.service.exportCruise.exportSurvey=<html>Export du fichier survey.csv 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

1 0

r1087 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 10:46:40 +0200 (Mon, 10 Jun 2013) New Revision: 1087 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1087 Log: fixes #2618 [PROTOCOLE] modification de la liste des param?\195?\168tres : le bouton enregistr?\195?\169 ne s'active pas donc on ne peut pas enregistrer les modifications Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-06-10 08:22:47 UTC (rev 1086) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-06-10 08:46:40 UTC (rev 1087) @@ -307,7 +307,7 @@ public void setGearUseFeaturePmfmId(List<String> gearUseFeaturePmfmId) { Object oldValue = getGearUseFeaturePmfmId(); editObject.setGearUseFeaturePmfmId(gearUseFeaturePmfmId); - firePropertyChange(PROPERTY_GEAR_USE_FEATURE_PMFM_ID, oldValue, gearUseFeaturePmfmId); + firePropertyChange(PROPERTY_GEAR_USE_FEATURE_PMFM_ID, null, gearUseFeaturePmfmId); } @Override @@ -319,7 +319,7 @@ public void setVesselUseFeaturePmfmId(List<String> vesselUseFeaturePmfmId) { Object oldValue = getVesselUseFeaturePmfmId(); editObject.setVesselUseFeaturePmfmId(vesselUseFeaturePmfmId); - firePropertyChange(PROPERTY_VESSEL_USE_FEATURE_PMFM_ID, oldValue, vesselUseFeaturePmfmId); + firePropertyChange(PROPERTY_VESSEL_USE_FEATURE_PMFM_ID, null, vesselUseFeaturePmfmId); } @Override

1 0

r1086 - trunk/tutti-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 10:22:47 +0200 (Mon, 10 Jun 2013) New Revision: 1086 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1086 Log: fixes #2612 [ERGO] Erreur d'orthographe sur le libell?\195?\169 du bandeau d'ex?\195?\169cution en cours fixes #2617 [PROTOCOLE] harmoniser l'intitul?\195?\169 de l'onglet "mise ne oeuvre du navire" ?\195?\160 "autres param?\195?\168tres" (donc idem avec les intitul?\195?\169s dans trait) Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 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 2013-06-10 08:17:28 UTC (rev 1085) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-06-10 08:22:47 UTC (rev 1086) @@ -779,7 +779,7 @@ tutti.editProtocol.tab.caracteristic=Caractéristiques tutti.editProtocol.tab.caracteristic.gearUseFeature=Mise en œuvre de l'engin tutti.editProtocol.tab.caracteristic.lengthClasses=Classes de taille -tutti.editProtocol.tab.caracteristic.vesselUseFeature=Mise en œuvre du navire +tutti.editProtocol.tab.caracteristic.vesselUseFeature=Autres caractéristiques tutti.editProtocol.tab.info=Informations générales tutti.editProtocol.tab.species=Espèces tutti.editProtocol.table.header.age=Age @@ -1153,7 +1153,7 @@ tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile=Importer un référentiel Personne tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile=Importer un référentiel Espèce tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile=Importer un référentiel Navire -tutti.message.action.running=<html>Action %s en cours d'éxécution...<hr/></html> +tutti.message.action.running=<html>Action %s en cours d'exécution...<hr/></html> tutti.multiPostImportLog.close=Fermer tutti.multiPostImportLog.close.mnemonic=F tutti.multiPostImportLog.close.tip=Fermer la popup

1 0

r1085 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by kmorin＠users.forge.codelutin.com June 10, 2013

June 10, 2013

Author: kmorin Date: 2013-06-10 10:17:28 +0200 (Mon, 10 Jun 2013) New Revision: 1085 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1085 Log: fixes #2622 [CONTROLE] - Erreur blocante ?\195?\160 la validation Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-06-04 13:43:20 UTC (rev 1084) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-06-10 08:17:28 UTC (rev 1085) @@ -314,27 +314,31 @@ Map<String, List<String>> warningMap = Maps.newHashMap(); Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); - for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { - if (isSpeciesBatchInvalid(batch, protocol)) { - String species = speciesDecorator.toString(batch.getSpecies()); - String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) - .toString(batch.getSampleCategoryValue()); - warningMap.put("species", - Lists.newArrayList(_("tutti.validator.warning.species.protocolNotRespected", - species, categoryValue))); - break; + if (rootSpeciesBatch != null) { + for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { + if (isSpeciesBatchInvalid(batch, protocol)) { + String species = speciesDecorator.toString(batch.getSpecies()); + String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) + .toString(batch.getSampleCategoryValue()); + warningMap.put("species", + Lists.newArrayList(_("tutti.validator.warning.species.protocolNotRespected", + species, categoryValue))); + break; + } } } - for (BenthosBatch batch : rootBenthosBatch.getChildren()) { - if (isBenthosBatchInvalid(batch, protocol)) { - String species = speciesDecorator.toString(batch.getSpecies()); - String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) - .toString(batch.getSampleCategoryValue()); - warningMap.put("benthos", - Lists.newArrayList(_("tutti.validator.warning.benthos.protocolNotRespected", - species, categoryValue))); - break; + if (rootBenthosBatch != null) { + for (BenthosBatch batch : rootBenthosBatch.getChildren()) { + if (isBenthosBatchInvalid(batch, protocol)) { + String species = speciesDecorator.toString(batch.getSpecies()); + String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) + .toString(batch.getSampleCategoryValue()); + warningMap.put("benthos", + Lists.newArrayList(_("tutti.validator.warning.benthos.protocolNotRespected", + species, categoryValue))); + break; + } } }

1 0