This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit edacc6097dd598dd7e434b6234a42ae0bd9dd33e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 20:37:05 2015 +0100 reformat + imporve gear rank order import-export --- .../service/genericformat/csv/AccidentalCatchModel.java | 5 ++--- .../tutti/service/genericformat/csv/CatchModel.java | 3 +-- .../ifremer/tutti/service/genericformat/csv/CatchRow.java | 4 ++-- .../genericformat/csv/IndividualObservationModel.java | 3 +-- .../service/genericformat/csv/MarineLitterModel.java | 3 +-- .../genericformat/csv/RowWithCruiseContextSupport.java | 2 +- .../genericformat/csv/RowWithOperationContextSupport.java | 15 +++++++++++++++ .../service/genericformat/csv/SampleCategoryRow.java | 2 +- .../tutti/service/genericformat/csv/SurveyModel.java | 2 +- 9 files changed, 25 insertions(+), 14 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java index d2135b2..92c7a9e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -76,7 +75,7 @@ public class AccidentalCatchModel extends AbstractTuttiImportExportModel<Acciden newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", AccidentalCatchRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Id_Lot", AccidentalCatchRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("Code_Taxon", AccidentalBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_TECHNICAL_FORMATTER); @@ -103,7 +102,7 @@ public class AccidentalCatchModel extends AbstractTuttiImportExportModel<Acciden newIgnoredColumn("Engin"); newIgnoredColumn("Rang_Engin"); - newMandatoryColumn("Id_Lot",AccidentalCatchRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); + newMandatoryColumn("Id_Lot", AccidentalCatchRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newMandatoryColumn("Code_Taxon", AccidentalBatch.PROPERTY_SPECIES, parserFactory.getSpeciesParser()); newIgnoredColumn("Nom_Scientifique"); newMandatoryColumn("Commentaire", AccidentalBatch.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java index cb775a6..e68214f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java @@ -28,7 +28,6 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.CaracteristicValueParserFormatter; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; @@ -87,7 +86,7 @@ public class CatchModel extends AbstractTuttiImportExportModel<CatchRow> { newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", CatchRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Code_Taxon", SpeciesBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_TECHNICAL_FORMATTER); newColumnForExport("Code_Espece_Campagne", SpeciesBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_SURVEY_CODE_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java index 958566c..3b874c7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java @@ -242,8 +242,8 @@ public class CatchRow extends RowWithOperationContextSupport { public ExportSampleCategory getSampleCategory(SampleCategoryModelEntry sampleCategoryModelEntry) { int categoryOrder = sampleCategoryModelEntry.getOrder(); - if (sampleCategory.size()< categoryOrder) { - sampleCategory.add(categoryOrder , new ExportSampleCategory()); + if (sampleCategory.size() < categoryOrder) { + sampleCategory.add(categoryOrder, new ExportSampleCategory()); } return sampleCategory.get(categoryOrder); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java index 5a03a82..dfb75e5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -76,7 +75,7 @@ public class IndividualObservationModel extends AbstractTuttiImportExportModel<I newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", IndividualObservationRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Id_Lot", IndividualObservationRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("Code_Taxon", IndividualObservationBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_TECHNICAL_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java index 77a368a..09312bb 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -76,7 +75,7 @@ public class MarineLitterModel extends AbstractTuttiImportExportModel<MarineLitt newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); newNullableColumnForExport("Engin", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_FORMATTER); - newNullableColumnForExport("Rang_Engin", FishingOperation.PROPERTY_GEAR + "." + Gear.PROPERTY_RANK_ORDER, TuttiCsvUtil.SHORT); + newNullableColumnForExport("Rang_Engin", MarineLitterRow.PROPERTY_GEAR_RANK_ORDER, TuttiCsvUtil.SHORT); newColumnForExport("Categorie", MarineLitterBatch.PROPERTY_MARINE_LITTER_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); newColumnForExport("Categorie_Taille", MarineLitterBatch.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_FORMATTER); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java index f8f7995..9f56d45 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java @@ -54,5 +54,5 @@ public class RowWithCruiseContextSupport implements Serializable { public String getSurveyPart() { return cruise.getSurveyPart(); } - + } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java index af51911..51caf23 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java @@ -15,8 +15,12 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport private static final long serialVersionUID = 1L; + public static final String PROPERTY_GEAR_RANK_ORDER = "gearRankOrder"; + private FishingOperation fishingOperation; + protected short gearRankOrder; + public void forImport() { super.forImport(); setFishingOperation(FishingOperations.newFishingOperation()); @@ -24,6 +28,9 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport public void setFishingOperation(FishingOperation fishingOperation) { this.fishingOperation = fishingOperation; + if (getGear() != null) { + setGearRankOrder(getGear().getRankOrder()); + } } public void setStationNumber(String stationNumber) { @@ -46,6 +53,10 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport fishingOperation.setGear(gear); } + public void setGearRankOrder(short gearRankOrder) { + this.gearRankOrder = gearRankOrder; + } + public FishingOperation getFishingOperation() { return fishingOperation; } @@ -70,4 +81,8 @@ public class RowWithOperationContextSupport extends RowWithCruiseContextSupport return fishingOperation.getMultirigAggregation(); } + public short getGearRankOrder() { + return gearRankOrder; + } + } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java index 5b9e2ca..d7c347b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SampleCategoryRow.java @@ -45,7 +45,7 @@ public class SampleCategoryRow implements Serializable { public void setCaracteristic(Caracteristic caracteristic) { sampleCategoryModelEntry.setCaracteristic(caracteristic); - if (caracteristic!=null) { + if (caracteristic != null) { sampleCategoryModelEntry.setCategoryId(caracteristic.getIdAsInt()); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java index 6b05fb5..897433f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java @@ -55,7 +55,7 @@ public class SurveyModel extends AbstractTuttiImportExportModel<SurveyRow> { @Override public SurveyRow newEmptyInstance() { - SurveyRow row= SurveyRow.newEmptyInstance(); + SurveyRow row = SurveyRow.newEmptyInstance(); return row; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.