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 0b4d72a99eeda096612130c3578b647a1fb0dde3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 17:23:11 2015 +0100 introduce some row support (for cruise context and operation context) + adapts csv rows for import --- .../genericformat/csv/AccidentalCatchModel.java | 8 +- .../genericformat/csv/AccidentalCatchRow.java | 81 ++++------- .../service/genericformat/csv/CatchModel.java | 5 +- .../tutti/service/genericformat/csv/CatchRow.java | 72 +++------- .../genericformat/csv/GearCaracteristicModel.java | 5 +- .../genericformat/csv/GearCaracteristicRow.java | 44 +----- .../csv/IndividualObservationModel.java | 9 +- .../csv/IndividualObservationRow.java | 78 +++-------- .../genericformat/csv/MarineLitterModel.java | 4 +- .../service/genericformat/csv/MarineLitterRow.java | 83 +++++------ .../service/genericformat/csv/OperationModel.java | 10 +- .../service/genericformat/csv/OperationRow.java | 152 +++++---------------- .../service/genericformat/csv/ParameterModel.java | 6 +- .../service/genericformat/csv/ParameterRow.java | 83 ++--------- .../csv/RowWithCruiseContextSupport.java | 58 ++++++++ .../csv/RowWithOperationContextSupport.java | 73 ++++++++++ .../service/genericformat/csv/SurveyModel.java | 5 +- .../tutti/service/genericformat/csv/SurveyRow.java | 85 ++++-------- 18 files changed, 315 insertions(+), 546 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 eea120e..d2135b2 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 @@ -24,7 +24,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.Cruises; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; @@ -58,8 +57,7 @@ public class AccidentalCatchModel extends AbstractTuttiImportExportModel<Acciden @Override public AccidentalCatchRow newEmptyInstance() { - AccidentalCatchRow row = new AccidentalCatchRow(); - row.setCruise(Cruises.newCruise()); + AccidentalCatchRow row = AccidentalCatchRow.newEmptyInstance(); return row; } @@ -105,11 +103,11 @@ public class AccidentalCatchModel extends AbstractTuttiImportExportModel<Acciden newIgnoredColumn("Engin"); newIgnoredColumn("Rang_Engin"); - newIgnoredColumn("Id_Lot"); + 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); - newMandatoryColumn("Code_PMFM", AccidentalCatchRow.PROPERTY_CARACTERISTIC, parserFactory.getCaracteristicParser()); + newMandatoryColumn("Code_PMFM", AccidentalCatchRow.PROPERTY_CARACTERISTIC, parserFactory.getCaracteristicWithProtectedParser()); newIgnoredColumn("Libelle_PMFM"); newIgnoredColumn("Valeur"); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchRow.java index b52c090..29c7af2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchRow.java @@ -22,17 +22,10 @@ package fr.ifremer.tutti.service.genericformat.csv; * #L% */ -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.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; import java.io.Serializable; -import java.util.Date; /** * A row in a accidental catch export. @@ -40,9 +33,7 @@ import java.util.Date; * @author tchemit <chemit@codelutin.com> * @since 2.2 */ -public class AccidentalCatchRow implements Serializable { - - public static final String PROPERTY_BATCH = "batch"; +public class AccidentalCatchRow extends RowWithOperationContextSupport { private static final long serialVersionUID = 1L; @@ -52,26 +43,24 @@ public class AccidentalCatchRow implements Serializable { public static final String PROPERTY_CARACTERISTIC_VALUE = "caracteristicValue"; - protected Cruise cruise; + public static AccidentalCatchRow newEmptyInstance() { + AccidentalCatchRow row = new AccidentalCatchRow(); + row.forImport(); + return row; + } + + protected Integer batchId; - protected FishingOperation fishingOperation; + protected Species species; - protected AccidentalBatch batch; + protected String comment; protected Caracteristic caracteristic; protected Serializable caracteristicValue; - public void setCruise(Cruise cruise) { - this.cruise = cruise; - } - - public void setFishingOperation(FishingOperation fishingOperation) { - this.fishingOperation = fishingOperation; - } - - public void setBatch(AccidentalBatch batch) { - this.batch = batch; + public void setBatchId(Integer batchId) { + this.batchId = batchId; } public void setCaracteristic(Caracteristic caracteristic) { @@ -82,8 +71,16 @@ public class AccidentalCatchRow implements Serializable { this.caracteristicValue = caracteristicValue; } + public void setSpecies(Species species) { + this.species = species; + } + + public void setComment(String comment) { + this.comment = comment; + } + public Integer getBatchId() { - return batch.getIdAsInt(); + return batchId; } public Caracteristic getCaracteristic() { @@ -95,43 +92,11 @@ public class AccidentalCatchRow implements Serializable { } public String getComment() { - return batch.getComment(); + return comment; } public Species getSpecies() { - return batch.getSpecies(); - } - - public Date getBeginDate() { - return cruise.getBeginDate(); - } - - public Program getProgram() { - return cruise.getProgram(); - } - - public String getSurveyPart() { - return cruise.getSurveyPart(); - } - - public String getStationNumber() { - return fishingOperation.getStationNumber(); - } - - public Integer getFishingOperationNumber() { - return fishingOperation.getFishingOperationNumber(); - } - - public Gear getGear() { - return fishingOperation.getGear(); - } - - public Vessel getVessel() { - return fishingOperation.getVessel(); - } - - public String getMultirigAggregation() { - return fishingOperation.getMultirigAggregation(); + return species; } } 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 87b8560..cb775a6 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 @@ -23,7 +23,6 @@ package fr.ifremer.tutti.service.genericformat.csv; */ import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; @@ -68,8 +67,8 @@ public class CatchModel extends AbstractTuttiImportExportModel<CatchRow> { @Override public CatchRow newEmptyInstance() { - CatchRow row = new CatchRow(false, false); - row.setCruise(Cruises.newCruise()); + CatchRow row = CatchRow.newEmptyInstance(); + row.forImport(); return row; } 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 d9ac96a..958566c 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 @@ -25,21 +25,14 @@ package fr.ifremer.tutti.service.genericformat.csv; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.Serializable; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -48,7 +41,7 @@ import java.util.List; * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public class CatchRow implements Serializable { +public class CatchRow extends RowWithOperationContextSupport { private static final long serialVersionUID = 1L; @@ -79,9 +72,11 @@ public class CatchRow implements Serializable { public static final String FINAL_RAISING_FACTOR = "finalRaisingFactor"; - protected Cruise cruise; - - protected FishingOperation fishingOperation; + public static CatchRow newEmptyInstance() { + CatchRow row = new CatchRow(); + row.forImport(); + return row; + } protected final List<ExportSampleCategory> sampleCategory = new ArrayList<>(); @@ -101,23 +96,18 @@ public class CatchRow implements Serializable { protected String batchWeightUnit; - protected final boolean benthos; + protected boolean benthos; - protected final boolean vrac; + protected boolean vrac; protected final List<String> comment = new ArrayList<>(); - public CatchRow(boolean vrac, boolean benthos) { - this.vrac = vrac; + public void setBenthos(boolean benthos) { this.benthos = benthos; } - public void setCruise(Cruise cruise) { - this.cruise = cruise; - } - - public void setFishingOperation(FishingOperation fishingOperation) { - this.fishingOperation = fishingOperation; + public void setVrac(boolean vrac) { + this.vrac = vrac; } public void setReferenceWeight(Float referenceWeight) { @@ -160,38 +150,6 @@ public class CatchRow implements Serializable { this.finalRaisingFactor = finalRaisingFactor; } - public Date getBeginDate() { - return cruise.getBeginDate(); - } - - public Program getProgram() { - return cruise.getProgram(); - } - - public String getSurveyPart() { - return cruise.getSurveyPart(); - } - - public Vessel getVessel() { - return cruise.getVessel(); - } - - public String getStationNumber() { - return fishingOperation.getStationNumber(); - } - - public Integer getFishingOperationNumber() { - return fishingOperation.getFishingOperationNumber(); - } - - public Gear getGear() { - return fishingOperation.getGear(); - } - - public String getMultirigAggregation() { - return fishingOperation.getMultirigAggregation(); - } - public Object getFrequency() { return speciesFrequency == null ? benthosFrequency : speciesFrequency; } @@ -241,9 +199,11 @@ public class CatchRow implements Serializable { } public CatchRow copy() { - CatchRow result = new CatchRow(vrac, benthos); - result.setCruise(cruise); - result.setFishingOperation(fishingOperation); + CatchRow result = new CatchRow(); + result.setVrac(vrac); + result.setBenthos(benthos); + result.setCruise(getCruise()); + result.setFishingOperation(getFishingOperation()); result.sampleCategory.addAll(sampleCategory); if (benthosFrequency != null) { result.setBenthosFrequency(benthosFrequency); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java index 2b8c95e..4af55d4 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.service.genericformat.csv; */ import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -55,9 +54,7 @@ public class GearCaracteristicModel extends AbstractTuttiImportExportModel<GearC @Override public GearCaracteristicRow newEmptyInstance() { - GearCaracteristicRow row = new GearCaracteristicRow(); - Cruise cruise = Cruises.newCruise(); - row.setCruise(cruise); + GearCaracteristicRow row = GearCaracteristicRow.newEmptyInstance(); return row; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicRow.java index 8aeea72..bff3da2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicRow.java @@ -22,13 +22,10 @@ package fr.ifremer.tutti.service.genericformat.csv; * #L% */ -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; import java.io.Serializable; -import java.util.Date; /** * A row in a gear caracteristics export. @@ -36,7 +33,7 @@ import java.util.Date; * @author tchemit <chemit@codelutin.com> * @since 2.3.2 */ -public class GearCaracteristicRow implements Serializable { +public class GearCaracteristicRow extends RowWithCruiseContextSupport { private static final long serialVersionUID = 1L; @@ -48,7 +45,11 @@ public class GearCaracteristicRow implements Serializable { public static final String PROPERTY_RANK_ORDER = Gear.PROPERTY_RANK_ORDER; - protected Cruise cruise; + public static GearCaracteristicRow newEmptyInstance() { + GearCaracteristicRow row = new GearCaracteristicRow(); + row.forImport(); + return row; + } protected Gear gear; @@ -58,14 +59,6 @@ public class GearCaracteristicRow implements Serializable { protected Serializable value; - public void setCruise(Cruise cruise) { - this.cruise = cruise; - } - - public Cruise getCruise() { - return cruise; - } - public void setGear(Gear gear) { this.gear = gear; } @@ -82,30 +75,6 @@ public class GearCaracteristicRow implements Serializable { this.value = value; } - public void setBeginDate(Date beginDate) { - cruise.setBeginDate(beginDate); - } - - public void setSurveyPart(String surveyPart) { - cruise.setSurveyPart(surveyPart); - } - - public void setProgram(Program program) { - cruise.setProgram(program); - } - - public Date getBeginDate() { - return cruise.getBeginDate(); - } - - public Program getProgram() { - return cruise.getProgram(); - } - - public String getSurveyPart() { - return cruise.getSurveyPart(); - } - public Gear getGear() { return gear; } @@ -125,4 +94,5 @@ public class GearCaracteristicRow implements Serializable { public void setRankOrder(short rankOrder) { this.rankOrder = rankOrder; } + } 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 b7f9a33..5a03a82 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 @@ -23,7 +23,6 @@ package fr.ifremer.tutti.service.genericformat.csv; */ import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -58,9 +57,7 @@ public class IndividualObservationModel extends AbstractTuttiImportExportModel<I @Override public IndividualObservationRow newEmptyInstance() { - IndividualObservationRow row = new IndividualObservationRow(); - row.setCruise(Cruises.newCruise()); - + IndividualObservationRow row = IndividualObservationRow.newEmptyInstance(); return row; } @@ -106,11 +103,11 @@ public class IndividualObservationModel extends AbstractTuttiImportExportModel<I newIgnoredColumn("Engin"); newIgnoredColumn("Rang_Engin"); - newIgnoredColumn("Id_Lot"); + newMandatoryColumn("Id_Lot", IndividualObservationRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newMandatoryColumn("Code_Taxon", IndividualObservationBatch.PROPERTY_SPECIES, parserFactory.getSpeciesParser()); newIgnoredColumn("Nom_Scientifique"); newMandatoryColumn("Commentaire", IndividualObservationBatch.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); - newMandatoryColumn("Code_PMFM", IndividualObservationRow.PROPERTY_CARACTERISTIC, parserFactory.getCaracteristicParser()); + newMandatoryColumn("Code_PMFM", IndividualObservationRow.PROPERTY_CARACTERISTIC, parserFactory.getCaracteristicWithProtectedParser()); newIgnoredColumn("Libelle_PMFM"); newIgnoredColumn("Valeur"); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationRow.java index 09d80df..7d5afea 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationRow.java @@ -22,17 +22,10 @@ package fr.ifremer.tutti.service.genericformat.csv; * #L% */ -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.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; import java.io.Serializable; -import java.util.Date; /** * A row in a individual observation export. @@ -40,9 +33,7 @@ import java.util.Date; * @author tchemit <chemit@codelutin.com> * @since 2.0.1 */ -public class IndividualObservationRow implements Serializable { - - public static final String PROPERTY_BATCH = "batch"; +public class IndividualObservationRow extends RowWithOperationContextSupport { private static final long serialVersionUID = 1L; @@ -52,26 +43,24 @@ public class IndividualObservationRow implements Serializable { public static final String PROPERTY_CARACTERISTIC_VALUE = "caracteristicValue"; - protected Cruise cruise; + private Integer batchId; - protected FishingOperation fishingOperation; + protected Species species; - protected IndividualObservationBatch batch; + protected String comment; protected Caracteristic caracteristic; protected Serializable caracteristicValue; - public void setCruise(Cruise cruise) { - this.cruise = cruise; - } - - public void setFishingOperation(FishingOperation fishingOperation) { - this.fishingOperation = fishingOperation; + public static IndividualObservationRow newEmptyInstance() { + IndividualObservationRow row = new IndividualObservationRow(); + row.forImport(); + return row; } - public void setBatch(IndividualObservationBatch batch) { - this.batch = batch; + public void setBatchId(Integer batchId) { + this.batchId = batchId; } public void setCaracteristic(Caracteristic caracteristic) { @@ -82,8 +71,16 @@ public class IndividualObservationRow implements Serializable { this.caracteristicValue = caracteristicValue; } + public void setSpecies(Species species) { + this.species = species; + } + + public void setComment(String comment) { + this.comment = comment; + } + public Integer getBatchId() { - return batch.getIdAsInt(); + return batchId; } public Caracteristic getCaracteristic() { @@ -95,42 +92,11 @@ public class IndividualObservationRow implements Serializable { } public String getComment() { - return batch.getComment(); - } - - public Date getBeginDate() { - return cruise.getBeginDate(); - } - - public Program getProgram() { - return cruise.getProgram(); - } - - public String getSurveyPart() { - return cruise.getSurveyPart(); - } - - public String getStationNumber() { - return fishingOperation.getStationNumber(); - } - - public Integer getFishingOperationNumber() { - return fishingOperation.getFishingOperationNumber(); - } - - public Gear getGear() { - return fishingOperation.getGear(); - } - - public Vessel getVessel() { - return fishingOperation.getVessel(); - } - - public String getMultirigAggregation() { - return fishingOperation.getMultirigAggregation(); + return comment; } public Species getSpecies() { - return batch.getSpecies(); + return species; } + } 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 2c54ade..77a368a 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 @@ -23,7 +23,6 @@ package fr.ifremer.tutti.service.genericformat.csv; */ import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -58,8 +57,7 @@ public class MarineLitterModel extends AbstractTuttiImportExportModel<MarineLitt @Override public MarineLitterRow newEmptyInstance() { - MarineLitterRow row = new MarineLitterRow(); - row.setCruise(Cruises.newCruise()); + MarineLitterRow row = MarineLitterRow.newEmptyInstance(); return row; } 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 b843a8b..ea63b19 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 @@ -22,16 +22,9 @@ package fr.ifremer.tutti.service.genericformat.csv; * #L% */ -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.data.Program; +import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatchs; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.persistence.entities.referential.Gear; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; - -import java.io.Serializable; -import java.util.Date; /** * A row in a marine litter export. @@ -39,7 +32,7 @@ import java.util.Date; * @author tchemit <chemit@codelutin.com> * @since 2.0.1 */ -public class MarineLitterRow implements Serializable { +public class MarineLitterRow extends RowWithOperationContextSupport { public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; @@ -47,73 +40,61 @@ public class MarineLitterRow implements Serializable { private static final long serialVersionUID = 1L; - protected Cruise cruise; - - protected FishingOperation fishingOperation; - - protected MarineLitterBatch batch; - - public void setCruise(Cruise cruise) { - this.cruise = cruise; - } + protected MarineLitterBatch marineLitterBatch; - public void setFishingOperation(FishingOperation fishingOperation) { - this.fishingOperation = fishingOperation; + public static MarineLitterRow newEmptyInstance() { + MarineLitterRow row = new MarineLitterRow(); + row.forImport(); + row.setMarineLitterBatch(MarineLitterBatchs.newMarineLitterBatch()); + return row; } - public void setBatch(MarineLitterBatch batch) { - this.batch = batch; + public void setMarineLitterBatch(MarineLitterBatch marineLitterBatch) { + this.marineLitterBatch = marineLitterBatch; } - public CaracteristicQualitativeValue getMarineLitterCategory() { - return batch.getMarineLitterCategory(); - } - - public CaracteristicQualitativeValue getMarineLitterSizeCategory() { - return batch.getMarineLitterSizeCategory(); + public void setMarineLitterCategory(CaracteristicQualitativeValue marineLitterCategory) { + marineLitterBatch.setMarineLitterCategory(marineLitterCategory); } - public Integer getNumber() { - return batch.getNumber(); + public void setMarineLitterSizeCategory(CaracteristicQualitativeValue marineLitterSizeCategory) { + marineLitterBatch.setMarineLitterSizeCategory(marineLitterSizeCategory); } - public Float getWeight() { - return batch.getWeight(); + public void setNumber(Integer number) { + marineLitterBatch.setNumber(number); } - public String getComment() { - return batch.getComment(); + public void setWeight(Float weight) { + marineLitterBatch.setWeight(weight); } - public Date getBeginDate() { - return cruise.getBeginDate(); + public void setComment(String comment) { + marineLitterBatch.setComment(comment); } - public Program getProgram() { - return cruise.getProgram(); + public MarineLitterBatch getMarineLitterBatch() { + return marineLitterBatch; } - public String getSurveyPart() { - return cruise.getSurveyPart(); + public CaracteristicQualitativeValue getMarineLitterCategory() { + return marineLitterBatch.getMarineLitterCategory(); } - public String getStationNumber() { - return fishingOperation.getStationNumber(); + public CaracteristicQualitativeValue getMarineLitterSizeCategory() { + return marineLitterBatch.getMarineLitterSizeCategory(); } - public Integer getFishingOperationNumber() { - return fishingOperation.getFishingOperationNumber(); + public Integer getNumber() { + return marineLitterBatch.getNumber(); } - public Gear getGear() { - return fishingOperation.getGear(); + public Float getWeight() { + return marineLitterBatch.getWeight(); } - public Vessel getVessel() { - return fishingOperation.getVessel(); + public String getComment() { + return marineLitterBatch.getComment(); } - public String getMultirigAggregation() { - return fishingOperation.getMultirigAggregation(); - } } 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 9548096..3c7d9a6 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 @@ -22,11 +22,8 @@ package fr.ifremer.tutti.service.genericformat.csv; * #L% */ -import fr.ifremer.tutti.persistence.entities.data.CatchBatchs; import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; @@ -58,13 +55,8 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> @Override public OperationRow newEmptyInstance() { - - OperationRow row = new OperationRow(); - row.setCruise(Cruises.newCruise()); - row.setFishingOperation(FishingOperations.newFishingOperation()); - row.setCatchBatch(CatchBatchs.newCatchBatch()); + OperationRow row = OperationRow.newEmptyInstance(); return row; - } protected OperationModel(char separator) { 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 8dcd49c..b8da4c3 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 @@ -24,17 +24,12 @@ package fr.ifremer.tutti.service.genericformat.csv; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.CatchBatchs; -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.util.DateTimes; import fr.ifremer.tutti.util.Numbers; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -44,7 +39,7 @@ import java.util.List; * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public class OperationRow implements Serializable { +public class OperationRow extends RowWithOperationContextSupport { public static final String PROPERTY_DURATION = "duration"; @@ -126,10 +121,6 @@ public class OperationRow implements Serializable { private static final long serialVersionUID = 1L; - protected Cruise cruise; - - protected FishingOperation fishingOperation; - protected CatchBatch catchBatch; protected boolean catchTotalWeightComputed; @@ -150,20 +141,13 @@ public class OperationRow implements Serializable { protected boolean marineLitterTotalWeightComputed; - public void setCruise(Cruise cruise) { - this.cruise = cruise; - } - - public Cruise getCruise() { - return cruise; - } + public static OperationRow newEmptyInstance() { - public void setFishingOperation(FishingOperation fishingOperation) { - this.fishingOperation = fishingOperation; - } + OperationRow row = new OperationRow(); + row.forImport(); + row.setCatchBatch(CatchBatchs.newCatchBatch()); + return row; - public FishingOperation getFishingOperation() { - return fishingOperation; } public void setCatchBatch(CatchBatch catchBatch) { @@ -199,96 +183,64 @@ public class OperationRow implements Serializable { return catchBatch; } - public void setBeginDate(Date beginDate) { - cruise.setBeginDate(beginDate); - } - - public void setSurveyPart(String surveyPart) { - cruise.setSurveyPart(surveyPart); - } - - public void setProgram(Program program) { - cruise.setProgram(program); - } - - public void setFishingOperationNumber(Integer fishingOperationNumber) { - fishingOperation.setFishingOperationNumber(fishingOperationNumber); - } - - public void setStationNumber(String stationNumber) { - fishingOperation.setStationNumber(stationNumber); - } - - public void setMultirigAggregation(String multirigAggregation) { - fishingOperation.setMultirigAggregation(multirigAggregation); - } - public void setSubStrata(TuttiLocation subStrata) { - fishingOperation.setSubStrata(subStrata); + getFishingOperation().setSubStrata(subStrata); } public void setStrata(TuttiLocation strata) { - fishingOperation.setStrata(strata); - } - - public void setVessel(Vessel vessel) { - fishingOperation.setVessel(vessel); - } - - public void setGear(Gear gear) { - fishingOperation.setGear(gear); + getFishingOperation().setStrata(strata); } public void setRecorderPerson(List<Person> recorderPerson) { - fishingOperation.setRecorderPerson(recorderPerson); + getFishingOperation().setRecorderPerson(recorderPerson); } public void setLocation(TuttiLocation location) { - fishingOperation.setLocation(location); + getFishingOperation().setLocation(location); } public void setSecondaryVessel(List<Vessel> secondaryVessel) { - fishingOperation.setSecondaryVessel(secondaryVessel); + getFishingOperation().setSecondaryVessel(secondaryVessel); } public void setComment(String comment) { - fishingOperation.setComment(comment); + getFishingOperation().setComment(comment); } public void setFishingOperationValid(Boolean fishingOperationValid) { - fishingOperation.setFishingOperationValid(fishingOperationValid); + getFishingOperation().setFishingOperationValid(fishingOperationValid); } public void setTrawlDistance(Integer trawlDistance) { - fishingOperation.setTrawlDistance(trawlDistance); + getFishingOperation().setTrawlDistance(trawlDistance); } public void setFishingOperationRectiligne(boolean fishingOperationRectiligne) { - fishingOperation.setFishingOperationRectiligne(fishingOperationRectiligne); + getFishingOperation().setFishingOperationRectiligne(fishingOperationRectiligne); } public void setGearShootingEndDate(Date gearShootingEndDate) { - fishingOperation.setGearShootingEndDate(gearShootingEndDate); + getFishingOperation().setGearShootingEndDate(gearShootingEndDate); } public void setGearShootingEndLongitude(Float gearShootingEndLongitude) { - fishingOperation.setGearShootingEndLongitude(gearShootingEndLongitude); + getFishingOperation().setGearShootingEndLongitude(gearShootingEndLongitude); } public void setGearShootingEndLatitude(Float gearShootingEndLatitude) { - fishingOperation.setGearShootingEndLatitude(gearShootingEndLatitude); + getFishingOperation().setGearShootingEndLatitude(gearShootingEndLatitude); } public void setGearShootingStartDate(Date gearShootingStartDate) { - fishingOperation.setGearShootingStartDate(gearShootingStartDate); + getFishingOperation().setGearShootingStartDate(gearShootingStartDate); } public void setGearShootingStartLongitude(Float gearShootingStartLongitude) { - fishingOperation.setGearShootingStartLongitude(gearShootingStartLongitude); + getFishingOperation().setGearShootingStartLongitude(gearShootingStartLongitude); } public void setGearShootingStartLatitude(Float gearShootingStartLatitude) { - fishingOperation.setGearShootingStartLatitude(gearShootingStartLatitude); + getFishingOperation().setGearShootingStartLatitude(gearShootingStartLatitude); } public void setBenthosTotalLivingNotItemizedWeight(Float benthosTotalLivingNotItemizedWeight) { @@ -335,96 +287,64 @@ public class OperationRow implements Serializable { catchBatch.setSpeciesTotalInertWeight(speciesTotalInertWeight); } - public Date getBeginDate() { - return cruise.getBeginDate(); - } - - public Program getProgram() { - return cruise.getProgram(); - } - - public String getSurveyPart() { - return cruise.getSurveyPart(); - } - - public String getStationNumber() { - return fishingOperation.getStationNumber(); - } - - public Integer getFishingOperationNumber() { - return fishingOperation.getFishingOperationNumber(); - } - - public String getMultirigAggregation() { - return fishingOperation.getMultirigAggregation(); - } - - public Gear getGear() { - return fishingOperation.getGear(); - } - - public Vessel getVessel() { - return fishingOperation.getVessel(); - } - public Date getGearShootingStartDate() { - return fishingOperation.getGearShootingStartDate(); + return getFishingOperation().getGearShootingStartDate(); } public Float getGearShootingStartLatitude() { - return fishingOperation.getGearShootingStartLatitude(); + return getFishingOperation().getGearShootingStartLatitude(); } public Float getGearShootingStartLongitude() { - return fishingOperation.getGearShootingStartLongitude(); + return getFishingOperation().getGearShootingStartLongitude(); } public Date getGearShootingEndDate() { - return fishingOperation.getGearShootingEndDate(); + return getFishingOperation().getGearShootingEndDate(); } public Float getGearShootingEndLatitude() { - return fishingOperation.getGearShootingEndLatitude(); + return getFishingOperation().getGearShootingEndLatitude(); } public Float getGearShootingEndLongitude() { - return fishingOperation.getGearShootingEndLongitude(); + return getFishingOperation().getGearShootingEndLongitude(); } public TuttiLocation getStrata() { - return fishingOperation.getStrata(); + return getFishingOperation().getStrata(); } public TuttiLocation getSubStrata() { - return fishingOperation.getSubStrata(); + return getFishingOperation().getSubStrata(); } public TuttiLocation getLocation() { - return fishingOperation.getLocation(); + return getFishingOperation().getLocation(); } public Boolean getFishingOperationValid() { - return fishingOperation.getFishingOperationValid(); + return getFishingOperation().getFishingOperationValid(); } public boolean isFishingOperationRectiligne() { - return fishingOperation.isFishingOperationRectiligne(); + return getFishingOperation().isFishingOperationRectiligne(); } public Integer getTrawlDistance() { - return fishingOperation.getTrawlDistance(); + return getFishingOperation().getTrawlDistance(); } public String getComment() { - return fishingOperation.getComment(); + return getFishingOperation().getComment(); } public List<Person> getRecorderPerson() { - return fishingOperation.getRecorderPerson(); + return getFishingOperation().getRecorderPerson(); } public List<Vessel> getSecondaryVessel() { - return fishingOperation.getSecondaryVessel(); + return getFishingOperation().getSecondaryVessel(); } public String getDuration() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java index b43eea7..2ae2c06 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java @@ -23,9 +23,7 @@ package fr.ifremer.tutti.service.genericformat.csv; */ import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; @@ -57,9 +55,7 @@ public class ParameterModel extends AbstractTuttiImportExportModel<ParameterRow> @Override public ParameterRow newEmptyInstance() { - ParameterRow row = new ParameterRow(); - row.setCruise(Cruises.newCruise()); - row.setFishingOperation(FishingOperations.newFishingOperation()); + ParameterRow row = ParameterRow.newEmptyInstance(); return row; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterRow.java index 6357bbe..60c7896 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterRow.java @@ -22,13 +22,9 @@ package fr.ifremer.tutti.service.genericformat.csv; * #L% */ -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import java.io.Serializable; -import java.util.Date; /** * A row in a parameter export. @@ -36,14 +32,11 @@ import java.util.Date; * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public class ParameterRow implements Serializable { +public class ParameterRow extends RowWithOperationContextSupport { private static final long serialVersionUID = 1L; - public static enum ParameterType { - GEAR, - VESSEL - } + public static enum ParameterType {GEAR, VESSEL} public static final String PROPERTY_CARACTERISTIC = "caracteristic"; @@ -51,9 +44,13 @@ public class ParameterRow implements Serializable { public static final String PROPERTY_PARAMETER_TYPE = "parameterType"; - private Cruise cruise; + public static ParameterRow newEmptyInstance() { + + ParameterRow row = new ParameterRow(); + row.forImport(); + return row; - private FishingOperation fishingOperation; + } private Caracteristic caracteristic; @@ -65,14 +62,6 @@ public class ParameterRow implements Serializable { this.parameterType = parameterType; } - public void setCruise(Cruise cruise) { - this.cruise = cruise; - } - - public void setFishingOperation(FishingOperation fishingOperation) { - this.fishingOperation = fishingOperation; - } - public void setCaracteristic(Caracteristic caracteristic) { this.caracteristic = caracteristic; } @@ -81,66 +70,10 @@ public class ParameterRow implements Serializable { this.value = value; } - public void setSurveyPart(String surveyPart) { - cruise.setSurveyPart(surveyPart); - } - - public void setBeginDate(Date beginDate) { - cruise.setBeginDate(beginDate); - } - - public void setProgram(Program program) { - cruise.setProgram(program); - } - - public void setStationNumber(String stationNumber) { - fishingOperation.setStationNumber(stationNumber); - } - - public void setFishingOperationNumber(Integer fishingOperationNumber) { - fishingOperation.setFishingOperationNumber(fishingOperationNumber); - } - - public void setMultirigAggregation(String multirigAggregation) { - fishingOperation.setMultirigAggregation(multirigAggregation); - } - public ParameterType getParameterType() { return parameterType; } - public Cruise getCruise() { - return cruise; - } - - public FishingOperation getFishingOperation() { - return fishingOperation; - } - - public Date getBeginDate() { - return cruise.getBeginDate(); - } - - public Program getProgram() { - return cruise.getProgram(); - } - - public String getSurveyPart() { - return cruise.getSurveyPart(); - } - - public String getStationNumber() { - return fishingOperation.getStationNumber(); - } - - public Integer getFishingOperationNumber() { - return fishingOperation.getFishingOperationNumber(); - } - - public String getMultirigAggregation() { - return fishingOperation.getMultirigAggregation(); - } - public Caracteristic getCaracteristic() { return caracteristic; } 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 new file mode 100644 index 0000000..f8f7995 --- /dev/null +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithCruiseContextSupport.java @@ -0,0 +1,58 @@ +package fr.ifremer.tutti.service.genericformat.csv; + +import fr.ifremer.tutti.persistence.entities.data.Cruise; +import fr.ifremer.tutti.persistence.entities.data.Cruises; +import fr.ifremer.tutti.persistence.entities.data.Program; + +import java.io.Serializable; +import java.util.Date; + +/** + * Created on 2/20/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.14 + */ +public class RowWithCruiseContextSupport implements Serializable { + + private static final long serialVersionUID = 1L; + + private Cruise cruise; + + public void forImport() { + setCruise(Cruises.newCruise()); + } + + public void setCruise(Cruise cruise) { + this.cruise = cruise; + } + + public void setSurveyPart(String surveyPart) { + cruise.setSurveyPart(surveyPart); + } + + public void setBeginDate(Date beginDate) { + cruise.setBeginDate(beginDate); + } + + public void setProgram(Program program) { + cruise.setProgram(program); + } + + public Cruise getCruise() { + return cruise; + } + + public Date getBeginDate() { + return cruise.getBeginDate(); + } + + public Program getProgram() { + return cruise.getProgram(); + } + + 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 new file mode 100644 index 0000000..af51911 --- /dev/null +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/RowWithOperationContextSupport.java @@ -0,0 +1,73 @@ +package fr.ifremer.tutti.service.genericformat.csv; + +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.FishingOperations; +import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.Vessel; + +/** + * Created on 2/20/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.14 + */ +public class RowWithOperationContextSupport extends RowWithCruiseContextSupport { + + private static final long serialVersionUID = 1L; + + private FishingOperation fishingOperation; + + public void forImport() { + super.forImport(); + setFishingOperation(FishingOperations.newFishingOperation()); + } + + public void setFishingOperation(FishingOperation fishingOperation) { + this.fishingOperation = fishingOperation; + } + + public void setStationNumber(String stationNumber) { + fishingOperation.setStationNumber(stationNumber); + } + + public void setFishingOperationNumber(Integer fishingOperationNumber) { + fishingOperation.setFishingOperationNumber(fishingOperationNumber); + } + + public void setMultirigAggregation(String multirigAggregation) { + fishingOperation.setMultirigAggregation(multirigAggregation); + } + + public void setVessel(Vessel vessel) { + fishingOperation.setVessel(vessel); + } + + public void setGear(Gear gear) { + fishingOperation.setGear(gear); + } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + + public String getStationNumber() { + return fishingOperation.getStationNumber(); + } + + public Integer getFishingOperationNumber() { + return fishingOperation.getFishingOperationNumber(); + } + + public Gear getGear() { + return fishingOperation.getGear(); + } + + public Vessel getVessel() { + return fishingOperation.getVessel(); + } + + public String getMultirigAggregation() { + return fishingOperation.getMultirigAggregation(); + } + +} 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 e700cc2..6b05fb5 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 @@ -23,7 +23,6 @@ package fr.ifremer.tutti.service.genericformat.csv; */ import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import fr.ifremer.tutti.service.csv.TuttiCsvUtil; @@ -56,9 +55,7 @@ public class SurveyModel extends AbstractTuttiImportExportModel<SurveyRow> { @Override public SurveyRow newEmptyInstance() { - Cruise cruise = Cruises.newCruise(); - SurveyRow row = new SurveyRow(); - row.setCruise(cruise); + SurveyRow row= SurveyRow.newEmptyInstance(); return row; } 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 876d842..c48923a 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 @@ -22,14 +22,11 @@ package fr.ifremer.tutti.service.genericformat.csv; * #L% */ -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.GearWithOriginalRankOrder; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -39,7 +36,7 @@ import java.util.List; * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public class SurveyRow implements Serializable { +public class SurveyRow extends RowWithCruiseContextSupport { private static final long serialVersionUID = 1L; @@ -47,92 +44,64 @@ public class SurveyRow implements Serializable { public static final String PROPERTY_ID_SISMER = "idSismer"; - protected Cruise cruise; - - protected TuttiLocation country; - - public Cruise getCruise() { - return cruise; + public static SurveyRow newEmptyInstance() { + SurveyRow row = new SurveyRow(); + row.forImport(); + return row; } - public void setCruise(Cruise cruise) { - this.cruise = cruise; - } + protected TuttiLocation country; public void setCountry(TuttiLocation country) { this.country = country; } - public Date getBeginDate() { - return cruise.getBeginDate(); - } - - public Program getProgram() { - return cruise.getProgram(); - } - public void setDepartureLocation(TuttiLocation departureLocation) { - cruise.setDepartureLocation(departureLocation); + getCruise().setDepartureLocation(departureLocation); } public void setReturnLocation(TuttiLocation returnLocation) { - cruise.setReturnLocation(returnLocation); - } - - public void setProgram(Program program) { - cruise.setProgram(program); + getCruise().setReturnLocation(returnLocation); } public void setName(String name) { - cruise.setName(name); - } - - public void setSurveyPart(String surveyPart) { - cruise.setSurveyPart(surveyPart); + getCruise().setName(name); } public void setHeadOfMission(List<Person> headOfMission) { - cruise.setHeadOfMission(headOfMission); + getCruise().setHeadOfMission(headOfMission); } public void setMultirigNumber(Integer multirigNumber) { - cruise.setMultirigNumber(multirigNumber); + getCruise().setMultirigNumber(multirigNumber); } public void setHeadOfSortRoom(List<Person> headOfSortRoom) { - cruise.setHeadOfSortRoom(headOfSortRoom); + getCruise().setHeadOfSortRoom(headOfSortRoom); } public void setEndDate(Date endDate) { - cruise.setEndDate(endDate); + getCruise().setEndDate(endDate); } public void setGear(List<GearWithOriginalRankOrder> gear) { - cruise.setGear(gear); + getCruise().setGear(gear); } public void setComment(String comment) { - cruise.setComment(comment); - } - - public void setBeginDate(Date beginDate) { - cruise.setBeginDate(beginDate); + getCruise().setComment(comment); } public void setVessel(Vessel vessel) { - cruise.setVessel(vessel); - } - - public String getSurveyPart() { - return cruise.getSurveyPart(); + getCruise().setVessel(vessel); } public TuttiLocation getZone() { - return cruise.getProgram().getZone(); + return getCruise().getProgram().getZone(); } public Vessel getVessel() { - return cruise.getVessel(); + return getCruise().getVessel(); } public TuttiLocation getCountry() { @@ -140,39 +109,39 @@ public class SurveyRow implements Serializable { } public String getName() { - return cruise.getName(); + return getCruise().getName(); } public List<GearWithOriginalRankOrder> getGear() { - return cruise.getGear(); + return getCruise().getGear(); } public TuttiLocation getDepartureLocation() { - return cruise.getDepartureLocation(); + return getCruise().getDepartureLocation(); } public Date getEndDate() { - return cruise.getEndDate(); + return getCruise().getEndDate(); } public TuttiLocation getReturnLocation() { - return cruise.getReturnLocation(); + return getCruise().getReturnLocation(); } public String getComment() { - return cruise.getComment(); + return getCruise().getComment(); } public List<Person> getHeadOfMission() { - return cruise.getHeadOfMission(); + return getCruise().getHeadOfMission(); } public List<Person> getHeadOfSortRoom() { - return cruise.getHeadOfSortRoom(); + return getCruise().getHeadOfSortRoom(); } public Integer getMultirigNumber() { - return cruise.getMultirigNumber(); + return getCruise().getMultirigNumber(); } // see http://forge.codelutin.com/issues/2877 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.