[Tutti-commits] 05/10: refs #6820 modification des imports pour pouvoir importer les pj

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ee8aa173479d96a13fc4fad46763298a8e82a5cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 27 16:24:11 2015 +0100 refs #6820 modification des imports pour pouvoir importer les pj --- .../service/genericformat/csv/AttachmentRow.java | 12 ++++++++++ .../genericformat/csv/MarineLitterModel.java | 4 ++-- .../service/genericformat/csv/MarineLitterRow.java | 10 +++------ .../service/genericformat/csv/OperationModel.java | 8 +++---- .../service/genericformat/csv/OperationRow.java | 26 +++++++++++++--------- .../service/genericformat/csv/SurveyModel.java | 4 ++-- .../tutti/service/genericformat/csv/SurveyRow.java | 12 ++++++---- 7 files changed, 47 insertions(+), 29 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java index 882a366..abc17e7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java @@ -71,4 +71,16 @@ public class AttachmentRow implements Serializable { public ObjectTypeCode getObjectType() { return attachment.getObjectType(); } + + public Attachment toAttachment(Integer objectId) { + + Attachment result = Attachments.newAttachment(); + result.setObjectId(objectId); + result.setObjectType(getObjectType()); + result.setName(getName()); + result.setComment(getComment()); + result.setPath(getPath()); + return result; + + } } 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 e57e248..62539cc 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 @@ -82,7 +82,7 @@ public class MarineLitterModel extends AbstractTuttiImportExportModel<MarineLitt newColumnForExport("Commentaire", MarineLitterBatch.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); newColumnForExport("Serie_Id", Cruise.PROPERTY_PROGRAM, TuttiCsvUtil.PROGRAM_TECHNICAL_FORMATTER); - newColumnForExport("Lot_Id", MarineLitterRow.PROPERTY_MARINE_LITTER_ID); + newColumnForExport("Lot_Id", MarineLitterRow.PROPERTY_MARINE_LITTER_ID, TuttiCsvUtil.INTEGER); newColumnForExport("Categorie_Id", MarineLitterBatch.PROPERTY_MARINE_LITTER_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_TECHNICAL_FORMATTER); newColumnForExport("Categorie_Taille_Id", MarineLitterBatch.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, TuttiCsvUtil.CARACTERISTIC_VALUE_TECHNICAL_FORMATTER); @@ -105,7 +105,7 @@ public class MarineLitterModel extends AbstractTuttiImportExportModel<MarineLitt newMandatoryColumn("Commentaire", MarineLitterBatch.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); newMandatoryColumn("Serie_Id", Cruise.PROPERTY_PROGRAM, parserFactory.getProgramParser()); - newMandatoryColumn("Lot_Id", MarineLitterRow.PROPERTY_MARINE_LITTER_ID); + newMandatoryColumn("Lot_Id", MarineLitterRow.PROPERTY_MARINE_LITTER_ID, TuttiCsvUtil.INTEGER); newMandatoryColumn("Categorie_Id", MarineLitterBatch.PROPERTY_MARINE_LITTER_CATEGORY, parserFactory.getMarineLitterCategoryValueParser()); newMandatoryColumn("Categorie_Taille_Id", MarineLitterBatch.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, parserFactory.getMarineLitterSizeCategoryValueParser()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterRow.java index 05da7fc..b2d5d98 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterRow.java @@ -34,10 +34,6 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativ */ public class MarineLitterRow extends RowWithOperationContextSupport { - public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; - - public static final String PROPERTY_BATCH = "batch"; - private static final long serialVersionUID = 1L; public static final String PROPERTY_MARINE_LITTER_ID = "marineLitterId"; @@ -75,7 +71,7 @@ public class MarineLitterRow extends RowWithOperationContextSupport { marineLitterBatch.setComment(comment); } - public void setMarineLitterId(String marineLitterId) { + public void setMarineLitterId(Integer marineLitterId) { marineLitterBatch.setId(marineLitterId); } @@ -103,8 +99,8 @@ public class MarineLitterRow extends RowWithOperationContextSupport { return marineLitterBatch.getComment(); } - public String getMarineLitterId() { - return marineLitterBatch.getId(); + public Integer getMarineLitterId() { + return marineLitterBatch.getIdAsInt(); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java index f99381d..375ad81 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java @@ -153,8 +153,8 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> newColumnForExport("Serie_Id", Cruise.PROPERTY_PROGRAM, TuttiCsvUtil.PROGRAM_TECHNICAL_FORMATTER); newColumnForExport("Engin_Id", FishingOperation.PROPERTY_GEAR, TuttiCsvUtil.GEAR_TECHNICAL_FORMATTER); - newColumnForExport("Fishing_Operation_Id", OperationRow.PROPERTY_FISHING_OPERATION_ID); - newColumnForExport("Catch_Lot_Id", OperationRow.PROPERTY_CATCH_ID); + newColumnForExport("Fishing_Operation_Id", OperationRow.PROPERTY_FISHING_OPERATION_OBJECT_ID, TuttiCsvUtil.INTEGER); + newColumnForExport("Catch_Lot_Id", OperationRow.PROPERTY_CATCH_OBJECT_ID, TuttiCsvUtil.INTEGER); newColumnForExport("Navire_Id", FishingOperation.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_TECHNICAL_FORMATTER); newColumnForExport("Strate_Id", FishingOperation.PROPERTY_STRATA, TuttiCsvUtil.FISHING_OPERATION_STRATA_TECHNICAL_FORMATTER); newColumnForExport("Sous_Strate_Id", FishingOperation.PROPERTY_SUB_STRATA, TuttiCsvUtil.FISHING_OPERATION_SUB_STRATA_TECHNICAL_FORMATTER); @@ -253,8 +253,8 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> newMandatoryColumn("Serie_Id", Cruise.PROPERTY_PROGRAM, parserFactory.getProgramParser()); newMandatoryColumn("Engin_Id", FishingOperation.PROPERTY_GEAR, parserFactory.getGearParser()); - newMandatoryColumn("Fishing_Operation_Id", OperationRow.PROPERTY_FISHING_OPERATION_ID); - newMandatoryColumn("Catch_Lot_Id", OperationRow.PROPERTY_CATCH_ID); + newMandatoryColumn("Fishing_Operation_Id", OperationRow.PROPERTY_FISHING_OPERATION_OBJECT_ID, TuttiCsvUtil.INTEGER); + newMandatoryColumn("Catch_Lot_Id", OperationRow.PROPERTY_CATCH_OBJECT_ID, TuttiCsvUtil.INTEGER); newMandatoryColumn("Navire_Id", FishingOperation.PROPERTY_VESSEL, parserFactory.getVesselParser()); newMandatoryColumn("Strate_Id", FishingOperation.PROPERTY_STRATA, parserFactory.getFishingOperationStrataParser()); newMandatoryColumn("Sous_Strate_Id", FishingOperation.PROPERTY_SUB_STRATA, parserFactory.getFishingOperationSubStrataParser()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java index 9fff7c8..27fe645 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationRow.java @@ -125,9 +125,9 @@ public class OperationRow extends RowWithOperationContextSupport { private static final long serialVersionUID = 1L; - public static final String PROPERTY_CATCH_ID = "catchId"; + public static final String PROPERTY_CATCH_OBJECT_ID = "catchObjectId"; - public static final String PROPERTY_FISHING_OPERATION_ID = "fishingOperationId"; + public static final String PROPERTY_FISHING_OPERATION_OBJECT_ID = "fishingOperationObjectId"; protected Short gearRankOrder; @@ -151,6 +151,10 @@ public class OperationRow extends RowWithOperationContextSupport { protected Boolean marineLitterTotalWeightComputed; + protected Integer fishingOperationObjectId; + + protected Integer catchObjectId; + public static OperationRow newEmptyInstance() { OperationRow row = new OperationRow(); @@ -169,6 +173,7 @@ public class OperationRow extends RowWithOperationContextSupport { } this.catchBatch = catchBatch; + setCatchObjectId(catchBatch.getIdAsInt()); } @@ -198,14 +203,15 @@ public class OperationRow extends RowWithOperationContextSupport { if (getGear() != null) { setGearRankOrder(getGear().getRankOrder()); } + setFishingOperationObjectId(fishingOperation.getIdAsInt()); } - public void setCatchId(String catchId) { - getCatchBatch().setId(catchId); + public void setCatchObjectId(Integer catchObjectId) { + this.catchObjectId = catchObjectId; } - public void setFishingOperationId(String fishingOperationId) { - getFishingOperation().setId(fishingOperationId); + public void setFishingOperationObjectId(Integer fishingOperationObjectId) { + this.fishingOperationObjectId = fishingOperationObjectId; } public void setGear(Gear gear) { @@ -328,12 +334,12 @@ public class OperationRow extends RowWithOperationContextSupport { return gearRankOrder; } - public String getCatchId() { - return getCatchBatch().getId(); + public Integer getFishingOperationObjectId() { + return fishingOperationObjectId; } - public String getFishingOperationId() { - return getFishingOperation().getId(); + public Integer getCatchObjectId() { + return catchObjectId; } public Gear getGear() { 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 428fc84..b885563 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 @@ -84,7 +84,7 @@ public class SurveyModel extends AbstractTuttiImportExportModel<SurveyRow> { newColumnForExport("Commentaire", Cruise.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); newColumnForExport("Serie_Id", Cruise.PROPERTY_PROGRAM, TuttiCsvUtil.PROGRAM_TECHNICAL_FORMATTER); - newColumnForExport("Campagne_Id", Cruise.PROPERTY_ID); + newColumnForExport("Campagne_Id", SurveyRow.PROPERTY_OBJECT_ID, TuttiCsvUtil.INTEGER); newColumnForExport("Navire_Id", Cruise.PROPERTY_VESSEL, TuttiCsvUtil.VESSEL_TECHNICAL_FORMATTER); newColumnForExport("Engin_Id", Cruise.PROPERTY_GEAR, TuttiCsvUtil.GEAR_LIST_TECHNICAL_FORMATTER); newColumnForExport("Port_Deb_Campagne_Id", Cruise.PROPERTY_DEPARTURE_LOCATION, TuttiCsvUtil.HARBOUR_TECHNICAL_FORMATTER); @@ -114,7 +114,7 @@ public class SurveyModel extends AbstractTuttiImportExportModel<SurveyRow> { newMandatoryColumn("Commentaire", Cruise.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); newMandatoryColumn("Serie_Id", Cruise.PROPERTY_PROGRAM, parserFactory.getProgramParser()); - newMandatoryColumn("Campagne_Id", Cruise.PROPERTY_ID); + newMandatoryColumn("Campagne_Id", SurveyRow.PROPERTY_OBJECT_ID, TuttiCsvUtil.INTEGER); newMandatoryColumn("Navire_Id", Cruise.PROPERTY_VESSEL, parserFactory.getVesselParser()); newMandatoryColumn("Engin_Id", Cruise.PROPERTY_GEAR, parserFactory.getGearListParser()); newMandatoryColumn("Port_Deb_Campagne_Id", Cruise.PROPERTY_DEPARTURE_LOCATION, parserFactory.getHarbourParser()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyRow.java index fb69d9c..5149c37 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyRow.java @@ -44,6 +44,8 @@ public class SurveyRow extends RowWithCruiseContextSupport { public static final String PROPERTY_ID_SISMER = "idSismer"; + public static final String PROPERTY_OBJECT_ID = "objectId"; + public static SurveyRow newEmptyInstance() { SurveyRow row = new SurveyRow(); row.forImport(); @@ -52,12 +54,14 @@ public class SurveyRow extends RowWithCruiseContextSupport { protected TuttiLocation country; + private Integer objectId; + public void setCountry(TuttiLocation country) { this.country = country; } - public void setId(String id) { - getCruise().setId(id); + public void setObjectId(Integer id) { + this.objectId = id; } public void setDepartureLocation(TuttiLocation departureLocation) { @@ -112,8 +116,8 @@ public class SurveyRow extends RowWithCruiseContextSupport { return country; } - public String getId() { - return getCruise().getId(); + public Integer getObjectId() { + return objectId; } public String getName() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.