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 941e73e255094035076259e9ed494d8cd997d304 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 5 14:51:16 2014 +0200 fixes #5749: [IMPORT] import psion ne passe pas si on renseigne le champ heure en face de date de début --- .../core/dao/referential/pmfm/MatrixId2.java | 195 ------- .../core/dao/referential/pmfm/ObjectTypeCode2.java | 274 --------- .../adagio/core/dao/referential/pmfm/PmfmId2.java | 621 +++++---------------- .../dao/referential/pmfm/QualitativeValueId2.java | 246 -------- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../persistence/TuttiPersistenceNoDbImpl.java | 6 +- .../tutti/persistence/entities/TuttiEntities.java | 3 +- .../entities/protocol/TuttiProtocols.java | 19 +- .../AccidentalBatchPersistenceServiceImpl.java | 7 +- .../service/AttachmentPersistenceService.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 8 +- .../service/CruisePersistenceServiceImpl.java | 17 +- .../FishingOperationPersistenceServiceImpl.java | 77 ++- ...dualObservationBatchPersistenceServiceImpl.java | 4 +- .../service/ReferentialPersistenceServiceImpl.java | 43 +- .../service/util/BatchPersistenceHelper.java | 26 +- .../persistence/service/util/BatchTreeHelper.java | 36 +- .../service/util/MeasurementPersistenceHelper.java | 8 +- .../service/util/SamplePersistenceHelper.java | 4 +- .../main/java/fr/ifremer/tutti/util/DateTimes.java | 46 ++ .../resources/tutti-db-enumerations.properties | 13 +- .../src/main/xmi/tutti-persistence.zargo | Bin 56716 -> 56700 bytes .../AttachmentPersistenceServiceWriteTest.java | 12 +- .../BenthosBatchPersistenceServiceReadTest.java | 4 +- .../BenthosBatchPersistenceServiceWriteTest.java | 20 +- .../SpeciesBatchPersistenceServiceReadTest.java | 4 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 20 +- .../ifremer/tutti/service/PersistenceService.java | 8 +- .../catches/multipost/MultiPostExportService.java | 14 +- .../catches/multipost/MultiPostImportService.java | 16 +- .../service/export/generic/OperationExportRow.java | 4 +- .../service/psionimport/PsionImportService.java | 42 +- .../pupitri/PupitriImportExportService.java | 10 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 17 +- .../ifremer/tutti/service/pupitri/SpeciesRow.java | 42 +- .../psionimport/PsionImportServiceTest.java | 4 +- .../tutti/ui/swing/action/ImportPupitriAction.java | 4 +- .../category/EditSampleCategoryModelUIModel.java | 4 +- .../ui/swing/content/cruise/EditCruiseUIModel.java | 6 +- .../operation/EditFishingOperationUIHandler.java | 8 +- .../operation/EditFishingOperationUIModel.java | 6 +- .../operation/catches/EditCatchesUIModel.java | 6 +- .../accidental/AccidentalBatchRowModel.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 16 +- .../IndividualObservationBatchRowModel.java | 6 +- .../CreateIndividualObservationBatchUIHandler.java | 3 +- .../marinelitter/MarineLitterBatchRowModel.java | 6 +- .../catches/species/SpeciesBatchRowModel.java | 16 +- .../util/attachment/AttachmentModelAware.java | 4 +- 49 files changed, 507 insertions(+), 1468 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/MatrixId2.java b/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/MatrixId2.java deleted file mode 100644 index f981db2..0000000 --- a/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/MatrixId2.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * #%L - * Tutti :: Persistence - * %% - * Copyright (C) 2012 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.adagio.core.dao.referential.pmfm; - -import fr.ifremer.adagio.core.dao.technical.AdagioEnumerationDef; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import static org.nuiton.i18n.I18n.n; - -/** - * - */ -public enum MatrixId2 - implements Serializable, AdagioEnumerationDef<Integer> { - /** TODO: Model Documentation for Enumeration Literal PRODUCT_BATCH value 1 */ - PRODUCT_BATCH( - "adagio.enumeration.MatrixId.PRODUCT_BATCH", - n("adagio.enumeration.MatrixId.PRODUCT_BATCH.description"), - 1); - - /** - * The serial version UID of this class. Needed for serialization. - */ - private static final long serialVersionUID = 1L; - - private String key; - - private String description; - - private Integer enumValue; - - private MatrixId2(String key, String description, Integer value) { - this.key = key; - this.description = description; - this.enumValue = value; - } - - @Override - public void setValue(Integer newValue) { - if (newValue != null && !this.enumValue.equals(newValue)) { - // Update static lists - values.remove(this.enumValue); - literals.remove(this.enumValue); - this.enumValue = newValue; - values.put(this.enumValue, this); - literals.add(this.enumValue); - } - } - - @Override - public String getValueAsString() { - return String.valueOf(this.enumValue); - } - - /** - * Retrieves an instance of MatrixId from <code>its name</code>. - * - * @param name - * the name to create the MatrixId from. - * @return The enumeration literal named after the 'name' argument - */ - public static MatrixId2 fromString(String name) { - return MatrixId2.valueOf(name); - } - - /** - * Returns an enumeration literal Integer <code>value</code>. - * Required by JAXB2 enumeration implementation - * - * @return Integer with corresponding value - */ - public Integer value() { - return this.enumValue; - } - - /** - * Returns an instance of MatrixId from Integer <code>value</code>. - * Required by JAXB2 enumeration implementation - * - * @param value - * the value to create the MatrixId from. - * @return static Enumeration with corresponding value - */ - public static MatrixId2 fromValue(Integer value) { - for (MatrixId2 enumName : MatrixId2.values()) { - if (enumName.getValue().equals(value)) { - return enumName; - } - } - throw new IllegalArgumentException("MatrixId.fromValue(" + value.toString() + ')'); - } - - /** - * Gets the underlying value of this type safe enumeration. - * This method is necessary to comply with DaoBase implementation. - * - * @return The name of this literal. - */ - public Integer getValue() { - return this.enumValue; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return Integer.class; - } - - /** - * Returns an unmodifiable list containing the literals that are known by this enumeration. - * - * @return A List containing the actual literals defined by this enumeration, this list - * can not be modified. - */ - public static List<Integer> literals() { - return MatrixId2.literals; - } - - /** - * Returns an unmodifiable list containing the names of the literals that are known - * by this enumeration. - * - * @return A List containing the actual names of the literals defined by this - * enumeration, this list can not be modified. - */ - public static List<String> names() { - return MatrixId2.names; - } - - private static Map<Integer, MatrixId2> values = new LinkedHashMap<Integer, MatrixId2>(4, 1); - - private static List<Integer> literals = new ArrayList<Integer>(4); - - private static List<String> names = new ArrayList<String>(4); - - private static List<MatrixId2> valueList = new ArrayList<MatrixId2>(4); - - /** - * Initializes the values. - */ - static { - synchronized (MatrixId2.values) { - MatrixId2.values.put(PRODUCT_BATCH.enumValue, PRODUCT_BATCH); - } - synchronized (MatrixId2.valueList) { - MatrixId2.valueList.add(PRODUCT_BATCH); - // For Adagio, lists could be reload from configuration - // MatrixId.valueList = Collections.unmodifiableList(valueList); - } - synchronized (MatrixId2.literals) { - MatrixId2.literals.add(PRODUCT_BATCH.enumValue); - // For Adagio, lists could be reload from configuration - // MatrixId.literals = Collections.unmodifiableList(literals); - } - synchronized (MatrixId2.names) { - MatrixId2.names.add("PRODUCT_BATCH"); - MatrixId2.names = Collections.unmodifiableList(names); - } - } -} diff --git a/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/ObjectTypeCode2.java b/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/ObjectTypeCode2.java deleted file mode 100644 index c8d2f33..0000000 --- a/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/ObjectTypeCode2.java +++ /dev/null @@ -1,274 +0,0 @@ -package fr.ifremer.adagio.core.dao.referential.pmfm; - -/* - * #%L - * Tutti :: Persistence - * %% - * Copyright (C) 2012 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ifremer.adagio.core.dao.technical.AdagioEnumerationDef; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import static org.nuiton.i18n.I18n.n; - -/** - * Created on 4/24/14. - * - * @author Tony Chemit <chemit@codelutin.com> - * @since 3.5 - */ -public enum ObjectTypeCode2 implements Serializable, AdagioEnumerationDef<String> { - /** TODO: Model Documentation for Enumeration Literal ACTIVITY_CALENDAR value "ACTIVITY_CALENDAR" */ - ACTIVITY_CALENDAR( - "adagio.enumeration.ObjectTypeCode.ACTIVITY_CALENDAR", - n("adagio.enumeration.ObjectTypeCode.ACTIVITY_CALENDAR.description"), - "ACTIVITY_CALENDAR"), - /** TODO: Model Documentation for Enumeration Literal FISHING_TRIP value "FISHING_TRIP" */ - FISHING_TRIP( - "adagio.enumeration.ObjectTypeCode.FISHING_TRIP", - n("adagio.enumeration.ObjectTypeCode.FISHING_TRIP.description"), - "FISHING_TRIP"), - /** TODO: Model Documentation for Enumeration Literal OPERATION value "OPERATION" */ - OPERATION( - "adagio.enumeration.ObjectTypeCode.OPERATION", - n("adagio.enumeration.ObjectTypeCode.OPERATION.description"), - "OPERATION"), - /** TODO: Model Documentation for Enumeration Literal BATCH value "BATCH" */ - CATCH_BATCH( - "adagio.enumeration.ObjectTypeCode.CATCH_BATCH", - n("adagio.enumeration.ObjectTypeCode.CATCH_BATCH.description"), - "CATCH_BATCH"), - /** TODO: Model Documentation for Enumeration Literal BATCH value "BATCH" */ - BATCH( - "adagio.enumeration.ObjectTypeCode.BATCH", - n("adagio.enumeration.ObjectTypeCode.BATCH.description"), - "BATCH"), - /** TODO: Model Documentation for Enumeration Literal SAMPLE value "SAMPLE" */ - SAMPLE( - "adagio.enumeration.ObjectTypeCode.SAMPLE", - n("adagio.enumeration.ObjectTypeCode.SAMPLE.description"), - "SAMPLE"), - /** TODO: Model Documentation for Enumeration Literal SCIENTIFIC_CRUISE value "SCIENTIFIC_CRUISE" */ - SCIENTIFIC_CRUISE( - "adagio.enumeration.ObjectTypeCode.SCIENTIFIC_CRUISE", - n("adagio.enumeration.ObjectTypeCode.SCIENTIFIC_CRUISE.description"), - "SCIENTIFIC_CRUISE"), - /** TODO: Model Documentation for Enumeration Literal SALE value "SALE" */ - SALE( - "adagio.enumeration.ObjectTypeCode.SALE", - n("adagio.enumeration.ObjectTypeCode.SALE.description"), - "SALE"), - /** TODO: Model Documentation for Enumeration Literal LANDING value "LANDING" */ - LANDING( - "adagio.enumeration.ObjectTypeCode.LANDING", - n("adagio.enumeration.ObjectTypeCode.LANDING.description"), - "LANDING"), - /** TODO: Model Documentation for Enumeration Literal DAILY_ACTIVITY_CALENDAR value "DAILY_ACTIVITY_CALENDAR" */ - DAILY_ACTIVITY_CALENDAR( - "adagio.enumeration.ObjectTypeCode.DAILY_ACTIVITY_CALENDAR", - n("adagio.enumeration.ObjectTypeCode.DAILY_ACTIVITY_CALENDAR.description"), - "DAILY_ACTIVITY_CALENDAR"); - - /** - * The serial version UID of this class. Needed for serialization. - */ - private static final long serialVersionUID = -8263283045204115976L; - - private String key; - - private String description; - - private String enumValue; - - private ObjectTypeCode2(String key, String description, String value) { - this.key = key; - this.description = description; - this.enumValue = value; - } - - @Override - public void setValue(String newValue) { - if (newValue != null && !this.enumValue.equals(newValue)) { - // Update static lists - values.remove(this.enumValue); - literals.remove(this.enumValue); - this.enumValue = newValue; - values.put(this.enumValue, this); - literals.add(this.enumValue); - } - } - - - @Override - public String getValueAsString() { - return String.valueOf(this.enumValue); - } - - /** - * Retrieves an instance of ObjectTypeCode2 from <code>its name</code>. - * - * @param name the name to create the ObjectTypeCode2 from. - * @return The enumeration literal named after the 'name' argument - */ - public static ObjectTypeCode2 fromString(String name) { - return ObjectTypeCode2.valueOf(name); - } - - /** - * Returns an enumeration literal String <code>value</code>. - * Required by JAXB2 enumeration implementation - * - * @return String with corresponding value - */ - public String value() { - return this.enumValue; - } - - /** - * Returns an instance of ObjectTypeCode2 from String <code>value</code>. - * Required by JAXB2 enumeration implementation - * - * @param value the value to create the ObjectTypeCode2 from. - * @return static Enumeration with corresponding value - */ - public static ObjectTypeCode2 fromValue(String value) { - for (ObjectTypeCode2 enumName : ObjectTypeCode2.values()) { - if (enumName.getValue().equals(value)) { - return enumName; - } - } - throw new IllegalArgumentException("ObjectTypeCode2.fromValue(" + value + ')'); - } - - /** - * Gets the underlying value of this type safe enumeration. - * This method is necessary to comply with DaoBase implementation. - * - * @return The name of this literal. - */ - public String getValue() { - return this.enumValue; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return String.class; - } - - /** - * Returns an unmodifiable list containing the literals that are known by this enumeration. - * - * @return A List containing the actual literals defined by this enumeration, this list - * can not be modified. - */ - public static List<String> literals() { - return ObjectTypeCode2.literals; - } - - /** - * Returns an unmodifiable list containing the names of the literals that are known - * by this enumeration. - * - * @return A List containing the actual names of the literals defined by this - * enumeration, this list can not be modified. - */ - public static List<String> names() { - return ObjectTypeCode2.names; - } - - private static Map<String, ObjectTypeCode2> values = new LinkedHashMap<String, ObjectTypeCode2>(9, 1); - - private static List<String> literals = new ArrayList<String>(9); - - private static List<String> names = new ArrayList<String>(9); - - private static List<ObjectTypeCode2> valueList = new ArrayList<ObjectTypeCode2>(9); - - /** - * Initializes the values. - */ - static { - synchronized (ObjectTypeCode2.values) { - ObjectTypeCode2.values.put(ACTIVITY_CALENDAR.enumValue, ACTIVITY_CALENDAR); - ObjectTypeCode2.values.put(FISHING_TRIP.enumValue, FISHING_TRIP); - ObjectTypeCode2.values.put(OPERATION.enumValue, OPERATION); - ObjectTypeCode2.values.put(BATCH.enumValue, BATCH); - ObjectTypeCode2.values.put(SAMPLE.enumValue, SAMPLE); - ObjectTypeCode2.values.put(SCIENTIFIC_CRUISE.enumValue, SCIENTIFIC_CRUISE); - ObjectTypeCode2.values.put(SALE.enumValue, SALE); - ObjectTypeCode2.values.put(LANDING.enumValue, LANDING); - ObjectTypeCode2.values.put(DAILY_ACTIVITY_CALENDAR.enumValue, DAILY_ACTIVITY_CALENDAR); - } - synchronized (ObjectTypeCode2.valueList) { - ObjectTypeCode2.valueList.add(ACTIVITY_CALENDAR); - ObjectTypeCode2.valueList.add(FISHING_TRIP); - ObjectTypeCode2.valueList.add(OPERATION); - ObjectTypeCode2.valueList.add(BATCH); - ObjectTypeCode2.valueList.add(SAMPLE); - ObjectTypeCode2.valueList.add(SCIENTIFIC_CRUISE); - ObjectTypeCode2.valueList.add(SALE); - ObjectTypeCode2.valueList.add(LANDING); - ObjectTypeCode2.valueList.add(DAILY_ACTIVITY_CALENDAR); - // For Adagio, lists could be reload from configuration - //ObjectTypeCode2.valueList = Collections.unmodifiableList(valueList); - } - synchronized (ObjectTypeCode2.literals) { - ObjectTypeCode2.literals.add(ACTIVITY_CALENDAR.enumValue); - ObjectTypeCode2.literals.add(FISHING_TRIP.enumValue); - ObjectTypeCode2.literals.add(OPERATION.enumValue); - ObjectTypeCode2.literals.add(BATCH.enumValue); - ObjectTypeCode2.literals.add(SAMPLE.enumValue); - ObjectTypeCode2.literals.add(SCIENTIFIC_CRUISE.enumValue); - ObjectTypeCode2.literals.add(SALE.enumValue); - ObjectTypeCode2.literals.add(LANDING.enumValue); - ObjectTypeCode2.literals.add(DAILY_ACTIVITY_CALENDAR.enumValue); - // For Adagio, lists could be reload from configuration - //ObjectTypeCode2.literals = Collections.unmodifiableList(literals); - } - synchronized (ObjectTypeCode2.names) { - ObjectTypeCode2.names.add("ACTIVITY_CALENDAR"); - ObjectTypeCode2.names.add("FISHING_TRIP"); - ObjectTypeCode2.names.add("OPERATION"); - ObjectTypeCode2.names.add("BATCH"); - ObjectTypeCode2.names.add("SAMPLE"); - ObjectTypeCode2.names.add("SCIENTIFIC_CRUISE"); - ObjectTypeCode2.names.add("SALE"); - ObjectTypeCode2.names.add("LANDING"); - ObjectTypeCode2.names.add("DAILY_ACTIVITY_CALENDAR"); - ObjectTypeCode2.names = Collections.unmodifiableList(names); - } - } - // type-safe-enumeration-object java merge-point -} \ No newline at end of file diff --git a/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/PmfmId2.java b/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/PmfmId2.java index 6edd8e1..173900e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/PmfmId2.java +++ b/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/PmfmId2.java @@ -33,471 +33,158 @@ import java.util.Map; import static org.nuiton.i18n.I18n.n; -/** - * - */ -public enum PmfmId2 - implements Serializable, AdagioEnumerationDef<Integer> -{ - // /** TODO: Model Documentation for Enumeration Literal ALIVE_WEIGHT_CALCULATED value "POIDS_CALCULE;6;1;6" */ - // ALIVE_WEIGHT_CALCULATED ( - // "adagio.enumeration.PmfmId.ALIVE_WEIGHT_CALCULATED", - // n("adagio.enumeration.PmfmId.ALIVE_WEIGHT_CALCULATED.description"), - // "POIDS_CALCULE;6;1;6"), - // /** TODO: Model Documentation for Enumeration Literal WEIGHT_SIZE_CALCULATED value "POIDS_CALCULE;6;1;7" */ - // WEIGHT_SIZE_CALCULATED ( - // "adagio.enumeration.PmfmId.WEIGHT_SIZE_CALCULATED", - // n("adagio.enumeration.PmfmId.WEIGHT_SIZE_CALCULATED.description"), - // "POIDS_CALCULE;6;1;7"), - // /** TODO: Model Documentation for Enumeration Literal WEIGHT_TOTAL_CALCULATED value "POIDS_CALCULE;6;1;17" */ - // WEIGHT_TOTAL_CALCULATED ( - // "adagio.enumeration.PmfmId.WEIGHT_TOTAL_CALCULATED", - // n("adagio.enumeration.PmfmId.WEIGHT_TOTAL_CALCULATED.description"), - // "POIDS_CALCULE;6;1;17"), - // /** TODO: Model Documentation for Enumeration Literal WEIGHT_SIZE_EXTRAPOLATE value "POIDS_CALCULE;6;1;21" */ - // WEIGHT_SIZE_EXTRAPOLATE ( - // "adagio.enumeration.PmfmId.WEIGHT_SIZE_EXTRAPOLATE", - // n("adagio.enumeration.PmfmId.WEIGHT_SIZE_EXTRAPOLATE.description"), - // "POIDS_CALCULE;6;1;21"), - // /** TODO: Model Documentation for Enumeration Literal CALCULATED_WEIGHT_CHILDREN_SUM value "POIDS_CALCULE;6;1;24" - // */ - // CALCULATED_WEIGHT_CHILDREN_SUM ( - // "adagio.enumeration.PmfmId.CALCULATED_WEIGHT_CHILDREN_SUM", - // n("adagio.enumeration.PmfmId.CALCULATED_WEIGHT_CHILDREN_SUM.description"), - // "POIDS_CALCULE;6;1;24"), - // /** TODO: Model Documentation for Enumeration Literal CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM value "POIDS_CALCULE;6;1;25" */ - // CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM ( - // "adagio.enumeration.PmfmId.CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM", - // n("adagio.enumeration.PmfmId.CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM.description"), - // "POIDS_CALCULE;6;1;25"), - // /** TODO: Model Documentation for Enumeration Literal MAX_DISTANCE_FOR_OPERATION_WITH_GEAR value "DISTANCE_MAX_OPERATION;17;1;1" */ - // MAX_DISTANCE_FOR_OPERATION_WITH_GEAR ( - // "adagio.enumeration.PmfmId.MAX_DISTANCE_FOR_OPERATION_WITH_GEAR", - // n("adagio.enumeration.PmfmId.MAX_DISTANCE_FOR_OPERATION_WITH_GEAR.description"), - // "DISTANCE_MAX_OPERATION;17;1;1"), - // /** TODO: Model Documentation for Enumeration Literal MAX_DURATION_FOR_OPERATION_WITH_GEAR value "DUREE_MAX_OPERATION;17;1;1" */ - // MAX_DURATION_FOR_OPERATION_WITH_GEAR ( - // "adagio.enumeration.PmfmId.MAX_DURATION_FOR_OPERATION_WITH_GEAR", - // n("adagio.enumeration.PmfmId.MAX_DURATION_FOR_OPERATION_WITH_GEAR.description"), - // "DUREE_MAX_OPERATION;17;1;1"), - // /** TODO: Model Documentation for Enumeration Literal MAX_DURATION_FOR_OPERATION_WITH_METIER value "DUREE_MAX_OPERATION;18;1;1" */ - // MAX_DURATION_FOR_OPERATION_WITH_METIER ( - // "adagio.enumeration.PmfmId.MAX_DURATION_FOR_OPERATION_WITH_METIER", - // n("adagio.enumeration.PmfmId.MAX_DURATION_FOR_OPERATION_WITH_METIER.description"), - // "DUREE_MAX_OPERATION;18;1;1"), - // /** TODO: Model Documentation for Enumeration Literal MAX_DISTANCE_FOR_OPERATION_WITH_METIER value "DISTANCE_MAX_OPERATION;18;1;1" */ - // MAX_DISTANCE_FOR_OPERATION_WITH_METIER ( - // "adagio.enumeration.PmfmId.MAX_DISTANCE_FOR_OPERATION_WITH_METIER", - // n("adagio.enumeration.PmfmId.MAX_DISTANCE_FOR_OPERATION_WITH_METIER.description"), - // "DISTANCE_MAX_OPERATION;18;1;1"), - // /** TODO: Model Documentation for Enumeration Literal STORAGE_STATE value "A_DEFINIR;1;1;1" */ - // STORAGE_STATE ( - // "adagio.enumeration.PmfmId.STORAGE_STATE", - // n("adagio.enumeration.PmfmId.STORAGE_STATE.description"), - // "A_DEFINIR;1;1;1"), - /** TODO: Model Documentation for Enumeration Literal SEX value "196" */ - SEX( - "adagio.enumeration.PmfmId.SEX", - n("adagio.enumeration.PmfmId.SEX.description"), - 196), - /** TODO: Model Documentation for Enumeration Literal SIZE_CATEGORY value "198" */ - SIZE_CATEGORY( - "adagio.enumeration.PmfmId.SIZE_CATEGORY", - n("adagio.enumeration.PmfmId.SIZE_CATEGORY.description"), - 198), - /** TODO: Model Documentation for Enumeration Literal AGE value "1430" */ - AGE( - "adagio.enumeration.PmfmId.AGE", - n("adagio.enumeration.PmfmId.AGE.description"), - 1430), - /** TODO: Model Documentation for Enumeration Literal MATURITY value "174" */ - MATURITY( - "adagio.enumeration.PmfmId.MATURITY", - n("adagio.enumeration.PmfmId.MATURITY.description"), - 174), - /** TODO: Model Documentation for Enumeration Literal MARINE_LITTER_TYPE value "1421" */ - MARINE_LITTER_TYPE( - "adagio.enumeration.PmfmId.MARINE_LITTER_TYPE", - n("adagio.enumeration.PmfmId.MARINE_LITTER_TYPE.description"), - 1421), - /** TODO: Model Documentation for Enumeration Literal MARINE_LITTER_SIZE_CATEGORY value "1422" */ - MARINE_LITTER_SIZE_CATEGORY( - "adagio.enumeration.PmfmId.MARINE_LITTER_SIZE_CATEGORY", - n("adagio.enumeration.PmfmId.MARINE_LITTER_SIZE_CATEGORY.description"), - 1422), - /** TODO: Model Documentation for Enumeration Literal SURVEY_PART value "1432" */ - SURVEY_PART( - "adagio.enumeration.PmfmId.SURVEY_PART", - n("adagio.enumeration.PmfmId.SURVEY_PART.description"), - 1432), - /** TODO: Model Documentation for Enumeration Literal STATION_NUMBER value "1243" */ - STATION_NUMBER( - "adagio.enumeration.PmfmId.STATION_NUMBER", - n("adagio.enumeration.PmfmId.STATION_NUMBER.description"), - 1243), - /** TODO: Model Documentation for Enumeration Literal TRAWL_DISTANCE value "113" */ - TRAWL_DISTANCE( - "adagio.enumeration.PmfmId.TRAWL_DISTANCE", - n("adagio.enumeration.PmfmId.TRAWL_DISTANCE.description"), - 113), - /** TODO: Model Documentation for Enumeration Literal HAUL_VALID value "1163" */ - HAUL_VALID( - "adagio.enumeration.PmfmId.HAUL_VALID", - n("adagio.enumeration.PmfmId.HAUL_VALID.description"), - 1163), - /** TODO: Model Documentation for Enumeration Literal RECTILINEAR_OPERATION value "192" */ - RECTILINEAR_OPERATION( - "adagio.enumeration.PmfmId.RECTILINEAR_OPERATION", - n("adagio.enumeration.PmfmId.RECTILINEAR_OPERATION.description"), - 192), - /** TODO: Model Documentation for Enumeration Literal MULTIRIG_NUMBER value "1420" */ - MULTIRIG_NUMBER( - "adagio.enumeration.PmfmId.MULTIRIG_NUMBER", - n("adagio.enumeration.PmfmId.MULTIRIG_NUMBER.description"), - 1420), - /** TODO: Model Documentation for Enumeration Literal MULTIRIG_AGGREGATION value "1424" */ - MULTIRIG_AGGREGATION( - "adagio.enumeration.PmfmId.MULTIRIG_AGGREGATION", - n("adagio.enumeration.PmfmId.MULTIRIG_AGGREGATION.description"), - 1424), - /** TODO: Model Documentation for Enumeration Literal WEIGHT_MEASURED value "220" */ - WEIGHT_MEASURED( - "adagio.enumeration.PmfmId.WEIGHT_MEASURED", - n("adagio.enumeration.PmfmId.WEIGHT_MEASURED.description"), - 220), - /** TODO: Model Documentation for Enumeration Literal SORTED_UNSORTED value "1428" */ - SORTED_UNSORTED( - "adagio.enumeration.PmfmId.SORTED_UNSORTED", - n("adagio.enumeration.PmfmId.SORTED_UNSORTED.description"), - 1428), - /** TODO: Model Documentation for Enumeration Literal SCIENTIFIC_CRUISE_SORTING_TYPE value "1429" */ - SCIENTIFIC_CRUISE_SORTING_TYPE( - "adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE", - n("adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE.description"), - 1429), - /** TODO: Model Documentation for Enumeration Literal SCIENTIFIC_CRUISE_SORTING_TYPE2 value "1431" */ - SCIENTIFIC_CRUISE_SORTING_TYPE2( - "adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE2", - n("adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE2.description"), - 1431), - /** TODO: Model Documentation for Enumeration Literal VERTICAL_OPENING value "832" */ - VERTICAL_OPENING( - "adagio.enumeration.PmfmId.VERTICAL_OPENING", - n("adagio.enumeration.PmfmId.VERTICAL_OPENING.description"), - 832), - /** TODO: Model Documentation for Enumeration Literal HORIZONTAL_OPENING_WINGS value "827" */ - HORIZONTAL_OPENING_WINGS( - "adagio.enumeration.PmfmId.HORIZONTAL_OPENING_WINGS", - n("adagio.enumeration.PmfmId.HORIZONTAL_OPENING_WINGS.description"), - 827), - /** TODO: Model Documentation for Enumeration Literal HORIZONTAL_OPENING_DOOR value "830" */ - HORIZONTAL_OPENING_DOOR( - "adagio.enumeration.PmfmId.HORIZONTAL_OPENING_DOOR", - n("adagio.enumeration.PmfmId.HORIZONTAL_OPENING_DOOR.description"), - 830), - /** TODO: Model Documentation for Enumeration Literal DEAD_OR_ALIVE value "1393" */ - DEAD_OR_ALIVE( - "adagio.enumeration.PmfmId.DEAD_OR_ALIVE", - n("adagio.enumeration.PmfmId.DEAD_OR_ALIVE.description"), - 1393), - /** TODO: Model Documentation for Enumeration Literal SORTING_TYPE_TCC value "1747" */ - SORTING_TYPE_TCC( - "adagio.enumeration.PmfmId.SORTING_TYPE_TCC", - n("adagio.enumeration.PmfmId.SORTING_TYPE_TCC.description"), - 1747), - - // NEW FOR TUTTI # PSFM "Pour référencer un autre id de pmfm" - ID_PSFM( - "adagio.enumeration.PmfmId.ID_PSFM", - n("adagio.enumeration.PmfmId.ID_PSFM.description"), - 1433); - - /** - * The serial version UID of this class. Needed for serialization. - */ - private static final long serialVersionUID = 1L; - - private String key; - private String description; - private Integer enumValue; - - private PmfmId2(String key, String description, Integer value) - { - this.key = key; - this.description = description; - this.enumValue = value; - } - - @Override - public void setValue(Integer newValue) { - if (newValue != null && !this.enumValue.equals(newValue)) { - // Update static lists - values.remove(this.enumValue); - literals.remove(this.enumValue); - this.enumValue = newValue; - values.put(this.enumValue, this); - literals.add(this.enumValue); - } - } - - @Override - public String getValueAsString() - { - return String.valueOf(this.enumValue); - } - - /** - * Retrieves an instance of PmfmId from <code>its name</code>. - * - * @param name - * the name to create the PmfmId from. - * @return The enumeration literal named after the 'name' argument - */ - public static PmfmId2 fromString(String name) - { - return PmfmId2.valueOf(name); - } - - /** - * Returns an enumeration literal String <code>value</code>. - * Required by JAXB2 enumeration implementation - * - * @return String with corresponding value - */ - public Integer value() - { - return this.enumValue; - } - - /** - * Returns an instance of PmfmId from String <code>value</code>. - * Required by JAXB2 enumeration implementation - * - * @param value - * the value to create the PmfmId from. - * @return static Enumeration with corresponding value - */ - public static PmfmId2 fromValue(String value) - { - for (PmfmId2 enumName : PmfmId2.values()) - { - if (enumName.getValue().equals(value)) - { - return enumName; - } - } - throw new IllegalArgumentException("PmfmId.fromValue(" + value + ')'); - } - - /** - * Gets the underlying value of this type safe enumeration. - * This method is necessary to comply with DaoBase implementation. - * - * @return The name of this literal. - */ - public Integer getValue() - { - return this.enumValue; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return String.class; - } - - /** - * Returns an unmodifiable list containing the literals that are known by this enumeration. - * - * @return A List containing the actual literals defined by this enumeration, this list - * can not be modified. - */ - public static List<Integer> literals() - { - return PmfmId2.literals; - } - - /** - * Returns an unmodifiable list containing the names of the literals that are known - * by this enumeration. - * - * @return A List containing the actual names of the literals defined by this - * enumeration, this list can not be modified. - */ - public static List<String> names() - { - return PmfmId2.names; - } - - private static final Map<Integer, PmfmId2> values = new LinkedHashMap<Integer, PmfmId2>(33, 1); - private static final List<Integer> literals = new ArrayList<Integer>(33); - private static List<String> names = new ArrayList<String>(33); - private static final List<PmfmId2> valueList = new ArrayList<PmfmId2>(33); - - /** - * Initializes the values. - */ - static - { - synchronized (PmfmId2.values) - { - // PmfmId2.values.put(ALIVE_WEIGHT_CALCULATED.enumValue, ALIVE_WEIGHT_CALCULATED); - // PmfmId2.values.put(WEIGHT_SIZE_CALCULATED.enumValue, WEIGHT_SIZE_CALCULATED); - // PmfmId2.values.put(WEIGHT_TOTAL_CALCULATED.enumValue, WEIGHT_TOTAL_CALCULATED); - // PmfmId2.values.put(WEIGHT_SIZE_EXTRAPOLATE.enumValue, WEIGHT_SIZE_EXTRAPOLATE); - // PmfmId2.values.put(CALCULATED_WEIGHT_CHILDREN_SUM.enumValue, CALCULATED_WEIGHT_CHILDREN_SUM); - // PmfmId2.values.put(CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM.enumValue, CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM); - // PmfmId2.values.put(MAX_DISTANCE_FOR_OPERATION_WITH_GEAR.enumValue, MAX_DISTANCE_FOR_OPERATION_WITH_GEAR); - // PmfmId2.values.put(MAX_DURATION_FOR_OPERATION_WITH_GEAR.enumValue, MAX_DURATION_FOR_OPERATION_WITH_GEAR); - // PmfmId2.values.put(MAX_DURATION_FOR_OPERATION_WITH_METIER.enumValue, - // MAX_DURATION_FOR_OPERATION_WITH_METIER); - // PmfmId2.values.put(MAX_DISTANCE_FOR_OPERATION_WITH_METIER.enumValue, - // MAX_DISTANCE_FOR_OPERATION_WITH_METIER); - // PmfmId2.values.put(STORAGE_STATE.enumValue, STORAGE_STATE); - PmfmId2.values.put(SEX.enumValue, SEX); - PmfmId2.values.put(SIZE_CATEGORY.enumValue, SIZE_CATEGORY); - PmfmId2.values.put(AGE.enumValue, AGE); - PmfmId2.values.put(MATURITY.enumValue, MATURITY); - PmfmId2.values.put(MARINE_LITTER_TYPE.enumValue, MARINE_LITTER_TYPE); - PmfmId2.values.put(MARINE_LITTER_SIZE_CATEGORY.enumValue, MARINE_LITTER_SIZE_CATEGORY); - PmfmId2.values.put(SURVEY_PART.enumValue, SURVEY_PART); - PmfmId2.values.put(STATION_NUMBER.enumValue, STATION_NUMBER); - PmfmId2.values.put(TRAWL_DISTANCE.enumValue, TRAWL_DISTANCE); - PmfmId2.values.put(HAUL_VALID.enumValue, HAUL_VALID); - PmfmId2.values.put(RECTILINEAR_OPERATION.enumValue, RECTILINEAR_OPERATION); - PmfmId2.values.put(MULTIRIG_NUMBER.enumValue, MULTIRIG_NUMBER); - PmfmId2.values.put(MULTIRIG_AGGREGATION.enumValue, MULTIRIG_AGGREGATION); - PmfmId2.values.put(WEIGHT_MEASURED.enumValue, WEIGHT_MEASURED); - PmfmId2.values.put(SORTED_UNSORTED.enumValue, SORTED_UNSORTED); - PmfmId2.values.put(SCIENTIFIC_CRUISE_SORTING_TYPE.enumValue, SCIENTIFIC_CRUISE_SORTING_TYPE); - PmfmId2.values.put(SCIENTIFIC_CRUISE_SORTING_TYPE2.enumValue, SCIENTIFIC_CRUISE_SORTING_TYPE2); - PmfmId2.values.put(VERTICAL_OPENING.enumValue, VERTICAL_OPENING); - PmfmId2.values.put(HORIZONTAL_OPENING_WINGS.enumValue, HORIZONTAL_OPENING_WINGS); - PmfmId2.values.put(HORIZONTAL_OPENING_DOOR.enumValue, HORIZONTAL_OPENING_DOOR); - PmfmId2.values.put(DEAD_OR_ALIVE.enumValue, DEAD_OR_ALIVE); - PmfmId2.values.put(SORTING_TYPE_TCC.enumValue, SORTING_TYPE_TCC); - } - synchronized (PmfmId2.valueList) - { - // PmfmId2.valueList.add(ALIVE_WEIGHT_CALCULATED); - // PmfmId2.valueList.add(WEIGHT_SIZE_CALCULATED); - // PmfmId2.valueList.add(WEIGHT_TOTAL_CALCULATED); - // PmfmId2.valueList.add(WEIGHT_SIZE_EXTRAPOLATE); - // PmfmId2.valueList.add(CALCULATED_WEIGHT_CHILDREN_SUM); - // PmfmId2.valueList.add(CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM); - // PmfmId2.valueList.add(MAX_DISTANCE_FOR_OPERATION_WITH_GEAR); - // PmfmId2.valueList.add(MAX_DURATION_FOR_OPERATION_WITH_GEAR); - // PmfmId2.valueList.add(MAX_DURATION_FOR_OPERATION_WITH_METIER); - // PmfmId2.valueList.add(MAX_DISTANCE_FOR_OPERATION_WITH_METIER); - // PmfmId2.valueList.add(STORAGE_STATE); - PmfmId2.valueList.add(SEX); - PmfmId2.valueList.add(SIZE_CATEGORY); - PmfmId2.valueList.add(AGE); - PmfmId2.valueList.add(MATURITY); - PmfmId2.valueList.add(MARINE_LITTER_TYPE); - PmfmId2.valueList.add(MARINE_LITTER_SIZE_CATEGORY); - PmfmId2.valueList.add(SURVEY_PART); - PmfmId2.valueList.add(STATION_NUMBER); - PmfmId2.valueList.add(TRAWL_DISTANCE); - PmfmId2.valueList.add(HAUL_VALID); - PmfmId2.valueList.add(RECTILINEAR_OPERATION); - PmfmId2.valueList.add(MULTIRIG_NUMBER); - PmfmId2.valueList.add(MULTIRIG_AGGREGATION); - PmfmId2.valueList.add(WEIGHT_MEASURED); - PmfmId2.valueList.add(SORTED_UNSORTED); - PmfmId2.valueList.add(SCIENTIFIC_CRUISE_SORTING_TYPE); - PmfmId2.valueList.add(SCIENTIFIC_CRUISE_SORTING_TYPE2); - PmfmId2.valueList.add(VERTICAL_OPENING); - PmfmId2.valueList.add(HORIZONTAL_OPENING_WINGS); - PmfmId2.valueList.add(HORIZONTAL_OPENING_DOOR); - PmfmId2.valueList.add(DEAD_OR_ALIVE); - PmfmId2.valueList.add(SORTING_TYPE_TCC); - // For Adagio, lists could be reload from configuration - // PmfmId.valueList = Collections.unmodifiableList(valueList); - } - synchronized (PmfmId2.literals) - { - // PmfmId2.literals.add(ALIVE_WEIGHT_CALCULATED.enumValue); - // PmfmId2.literals.add(WEIGHT_SIZE_CALCULATED.enumValue); - // PmfmId2.literals.add(WEIGHT_TOTAL_CALCULATED.enumValue); - // PmfmId2.literals.add(WEIGHT_SIZE_EXTRAPOLATE.enumValue); - // PmfmId2.literals.add(CALCULATED_WEIGHT_CHILDREN_SUM.enumValue); - // PmfmId2.literals.add(CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM.enumValue); - // PmfmId2.literals.add(MAX_DISTANCE_FOR_OPERATION_WITH_GEAR.enumValue); - // PmfmId2.literals.add(MAX_DURATION_FOR_OPERATION_WITH_GEAR.enumValue); - // PmfmId2.literals.add(MAX_DURATION_FOR_OPERATION_WITH_METIER.enumValue); - // PmfmId2.literals.add(MAX_DISTANCE_FOR_OPERATION_WITH_METIER.enumValue); - // PmfmId2.literals.add(STORAGE_STATE.enumValue); - PmfmId2.literals.add(SEX.enumValue); - PmfmId2.literals.add(SIZE_CATEGORY.enumValue); - PmfmId2.literals.add(AGE.enumValue); - PmfmId2.literals.add(MATURITY.enumValue); - PmfmId2.literals.add(MARINE_LITTER_TYPE.enumValue); - PmfmId2.literals.add(MARINE_LITTER_SIZE_CATEGORY.enumValue); - PmfmId2.literals.add(SURVEY_PART.enumValue); - PmfmId2.literals.add(STATION_NUMBER.enumValue); - PmfmId2.literals.add(TRAWL_DISTANCE.enumValue); - PmfmId2.literals.add(HAUL_VALID.enumValue); - PmfmId2.literals.add(RECTILINEAR_OPERATION.enumValue); - PmfmId2.literals.add(MULTIRIG_NUMBER.enumValue); - PmfmId2.literals.add(MULTIRIG_AGGREGATION.enumValue); - PmfmId2.literals.add(WEIGHT_MEASURED.enumValue); - PmfmId2.literals.add(SORTED_UNSORTED.enumValue); - PmfmId2.literals.add(SCIENTIFIC_CRUISE_SORTING_TYPE.enumValue); - PmfmId2.literals.add(SCIENTIFIC_CRUISE_SORTING_TYPE2.enumValue); - PmfmId2.literals.add(VERTICAL_OPENING.enumValue); - PmfmId2.literals.add(HORIZONTAL_OPENING_WINGS.enumValue); - PmfmId2.literals.add(HORIZONTAL_OPENING_DOOR.enumValue); - PmfmId2.literals.add(DEAD_OR_ALIVE.enumValue); - PmfmId2.literals.add(SORTING_TYPE_TCC.enumValue); - // For Adagio, lists could be reload from configuration - // PmfmId.literals = Collections.unmodifiableList(literals); - } - synchronized (PmfmId2.names) - { - PmfmId2.names.add("ALIVE_WEIGHT_CALCULATED"); - PmfmId2.names.add("WEIGHT_SIZE_CALCULATED"); - PmfmId2.names.add("WEIGHT_TOTAL_CALCULATED"); - PmfmId2.names.add("WEIGHT_SIZE_EXTRAPOLATE"); - PmfmId2.names.add("CALCULATED_WEIGHT_CHILDREN_SUM"); - PmfmId2.names.add("CALCULATED_ALIVE_WEIGHT_CHILDREN_SUM"); - PmfmId2.names.add("MAX_DISTANCE_FOR_OPERATION_WITH_GEAR"); - PmfmId2.names.add("MAX_DURATION_FOR_OPERATION_WITH_GEAR"); - PmfmId2.names.add("MAX_DURATION_FOR_OPERATION_WITH_METIER"); - PmfmId2.names.add("MAX_DISTANCE_FOR_OPERATION_WITH_METIER"); - PmfmId2.names.add("STORAGE_STATE"); - PmfmId2.names.add("SEX"); - PmfmId2.names.add("SIZE_CATEGORY"); - PmfmId2.names.add("AGE"); - PmfmId2.names.add("MATURITY"); - PmfmId2.names.add("MARINE_LITTER_TYPE"); - PmfmId2.names.add("MARINE_LITTER_SIZE_CATEGORY"); - PmfmId2.names.add("SURVEY_PART"); - PmfmId2.names.add("STATION_NUMBER"); - PmfmId2.names.add("TRAWL_DISTANCE"); - PmfmId2.names.add("HAUL_VALID"); - PmfmId2.names.add("RECTILINEAR_OPERATION"); - PmfmId2.names.add("MULTIRIG_NUMBER"); - PmfmId2.names.add("MULTIRIG_AGGREGATION"); - PmfmId2.names.add("WEIGHT_MEASURED"); - PmfmId2.names.add("SORTED_UNSORTED"); - PmfmId2.names.add("SCIENTIFIC_CRUISE_SORTING_TYPE"); - PmfmId2.names.add("SCIENTIFIC_CRUISE_SORTING_TYPE2"); - PmfmId2.names.add("VERTICAL_OPENING"); - PmfmId2.names.add("HORIZONTAL_OPENING_WINGS"); - PmfmId2.names.add("HORIZONTAL_OPENING_DOOR"); - PmfmId2.names.add("DEAD_OR_ALIVE"); - PmfmId2.names.add("SORTING_TYPE_TCC"); - PmfmId2.names = Collections.unmodifiableList(names); - } - } +public enum PmfmId2 implements Serializable, AdagioEnumerationDef<Integer> { + + // NEW FOR TUTTI # PSFM "Pour référencer un autre id de pmfm" + ID_PSFM( + "adagio.enumeration.PmfmId.ID_PSFM", + n("adagio.enumeration.PmfmId.ID_PSFM.description"), + 1433); + + /** + * The serial version UID of this class. Needed for serialization. + */ + private static final long serialVersionUID = 1L; + + private String key; + + private String description; + + private Integer enumValue; + + private PmfmId2(String key, String description, Integer value) { + this.key = key; + this.description = description; + this.enumValue = value; + } + + @Override + public void setValue(Integer newValue) { + if (newValue != null && !this.enumValue.equals(newValue)) { + // Update static lists + values.remove(this.enumValue); + literals.remove(this.enumValue); + this.enumValue = newValue; + values.put(this.enumValue, this); + literals.add(this.enumValue); + } + } + + @Override + public String getValueAsString() { + return String.valueOf(this.enumValue); + } + + /** + * Retrieves an instance of PmfmId from <code>its name</code>. + * + * @param name the name to create the PmfmId from. + * @return The enumeration literal named after the 'name' argument + */ + public static PmfmId2 fromString(String name) { + return PmfmId2.valueOf(name); + } + + /** + * Returns an enumeration literal String <code>value</code>. + * Required by JAXB2 enumeration implementation + * + * @return String with corresponding value + */ + public Integer value() { + return this.enumValue; + } + + /** + * Returns an instance of PmfmId from String <code>value</code>. + * Required by JAXB2 enumeration implementation + * + * @param value the value to create the PmfmId from. + * @return static Enumeration with corresponding value + */ + public static PmfmId2 fromValue(String value) { + for (PmfmId2 enumName : PmfmId2.values()) { + if (enumName.getValue().equals(value)) { + return enumName; + } + } + throw new IllegalArgumentException("PmfmId.fromValue(" + value + ')'); + } + + /** + * Gets the underlying value of this type safe enumeration. + * This method is necessary to comply with DaoBase implementation. + * + * @return The name of this literal. + */ + public Integer getValue() { + return this.enumValue; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return String.class; + } + + /** + * Returns an unmodifiable list containing the literals that are known by this enumeration. + * + * @return A List containing the actual literals defined by this enumeration, this list + * can not be modified. + */ + public static List<Integer> literals() { + return PmfmId2.literals; + } + + /** + * Returns an unmodifiable list containing the names of the literals that are known + * by this enumeration. + * + * @return A List containing the actual names of the literals defined by this + * enumeration, this list can not be modified. + */ + public static List<String> names() { + return PmfmId2.names; + } + + private static final Map<Integer, PmfmId2> values = new LinkedHashMap<Integer, PmfmId2>(33, 1); + + private static final List<Integer> literals = new ArrayList<Integer>(33); + + private static List<String> names = new ArrayList<String>(33); + + private static final List<PmfmId2> valueList = new ArrayList<PmfmId2>(33); + + /** + * Initializes the values. + */ + static { + synchronized (PmfmId2.values) { + PmfmId2.values.put(ID_PSFM.enumValue, ID_PSFM); + } + synchronized (PmfmId2.valueList) { + PmfmId2.valueList.add(ID_PSFM); + // For Adagio, lists could be reload from configuration + // PmfmId.valueList = Collections.unmodifiableList(valueList); + } + synchronized (PmfmId2.literals) { + PmfmId2.literals.add(ID_PSFM.enumValue); + // For Adagio, lists could be reload from configuration + // PmfmId.literals = Collections.unmodifiableList(literals); + } + synchronized (PmfmId2.names) { + PmfmId2.names.add("ID_PSFM"); + PmfmId2.names = Collections.unmodifiableList(names); + } + } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/QualitativeValueId2.java b/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/QualitativeValueId2.java deleted file mode 100644 index 8a22d42..0000000 --- a/tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/QualitativeValueId2.java +++ /dev/null @@ -1,246 +0,0 @@ -/* - * #%L - * Tutti :: Persistence - * %% - * Copyright (C) 2012 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -// -// Attention: Generated code! Do not modify by hand! -// Generated by: TypeSafeEnumeration.vsl in andromda-java-cartridge. -// Model Class: Data::fr.ifremer.adagio.core.dao::referential::pmfm::QualitativeValueId -// Metafacade: org.andromda.metafacades.uml.Enumeration -// Stereotype: Enumeration -// -package fr.ifremer.adagio.core.dao.referential.pmfm; - -import fr.ifremer.adagio.core.dao.technical.AdagioEnumerationDef; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import static org.nuiton.i18n.I18n.n; - -/** - * - */ -public enum QualitativeValueId2 - implements Serializable, AdagioEnumerationDef<Integer> { - /** TODO: Model Documentation for Enumeration Literal SEX_UNDEFINED value 203 */ - SEX_UNDEFINED( - "adagio.enumeration.QualitativeValueId.SEX_UNDEFINED", - n("adagio.enumeration.QualitativeValueId.SEX_UNDEFINED.description"), - 299), - /** TODO: Model Documentation for Enumeration Literal MATURITY_1 value 272 */ - MATURITY_1( - "adagio.enumeration.QualitativeValueId.MATURITY_1", - n("adagio.enumeration.QualitativeValueId.MATURITY_1.description"), - 272), - /** TODO: Model Documentation for Enumeration Literal MATURITY_2 value 273 */ - MATURITY_2( - "adagio.enumeration.QualitativeValueId.MATURITY_2", - n("adagio.enumeration.QualitativeValueId.MATURITY_2.description"), - 273), - /** TODO: Model Documentation for Enumeration Literal MATURITY_3 value 274 */ - MATURITY_3( - "adagio.enumeration.QualitativeValueId.MATURITY_3", - n("adagio.enumeration.QualitativeValueId.MATURITY_3.description"), - 274), - /** TODO: Model Documentation for Enumeration Literal MATURITY_4 value 275 */ - MATURITY_4( - "adagio.enumeration.QualitativeValueId.MATURITY_4", - n("adagio.enumeration.QualitativeValueId.MATURITY_4.description"), - 275), - /** TODO: Model Documentation for Enumeration Literal MATURITY_5 value 276 */ - MATURITY_5( - "adagio.enumeration.QualitativeValueId.MATURITY_5", - n("adagio.enumeration.QualitativeValueId.MATURITY_5.description"), - 276); - - /** - * The serial version UID of this class. Needed for serialization. - */ - private static final long serialVersionUID = 1L; - - private String key; - - private String description; - - private Integer enumValue; - - private QualitativeValueId2(String key, String description, Integer value) { - this.key = key; - this.description = description; - this.enumValue = value; - } - - @Override - public void setValue(Integer newValue) { - if (newValue != null && !this.enumValue.equals(newValue)) { - // Update static lists - values.remove(this.enumValue); - literals.remove(this.enumValue); - this.enumValue = newValue; - values.put(this.enumValue, this); - literals.add(this.enumValue); - } - } - - @Override - public String getValueAsString() { - return String.valueOf(this.enumValue); - } - - /** - * Retrieves an instance of QualitativeValueId from <code>its name</code>. - * - * @param name - * the name to create the QualitativeValueId from. - * @return The enumeration literal named after the 'name' argument - */ - public static QualitativeValueId2 fromString(String name) { - return QualitativeValueId2.valueOf(name); - } - - /** - * Returns an enumeration literal Integer <code>value</code>. - * Required by JAXB2 enumeration implementation - * - * @return Integer with corresponding value - */ - public Integer value() { - return this.enumValue; - } - - /** - * Returns an instance of QualitativeValueId from Integer <code>value</code>. - * Required by JAXB2 enumeration implementation - * - * @param value - * the value to create the QualitativeValueId from. - * @return static Enumeration with corresponding value - */ - public static QualitativeValueId2 fromValue(Integer value) { - for (QualitativeValueId2 enumName : QualitativeValueId2.values()) { - if (enumName.getValue().equals(value)) { - return enumName; - } - } - throw new IllegalArgumentException("QualitativeValueId.fromValue(" + value.toString() + ')'); - } - - /** - * Gets the underlying value of this type safe enumeration. - * This method is necessary to comply with DaoBase implementation. - * - * @return The name of this literal. - */ - public Integer getValue() { - return this.enumValue; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return Integer.class; - } - - /** - * Returns an unmodifiable list containing the literals that are known by this enumeration. - * - * @return A List containing the actual literals defined by this enumeration, this list - * can not be modified. - */ - public static List<Integer> literals() { - return QualitativeValueId2.literals; - } - - /** - * Returns an unmodifiable list containing the names of the literals that are known - * by this enumeration. - * - * @return A List containing the actual names of the literals defined by this - * enumeration, this list can not be modified. - */ - public static List<String> names() { - return QualitativeValueId2.names; - } - - private static Map<Integer, QualitativeValueId2> values = new LinkedHashMap<Integer, QualitativeValueId2>(38, 1); - - private static List<Integer> literals = new ArrayList<Integer>(38); - - private static List<String> names = new ArrayList<String>(38); - - private static List<QualitativeValueId2> valueList = new ArrayList<QualitativeValueId2>(38); - - /** - * Initializes the values. - */ - static { - synchronized (QualitativeValueId2.values) { - QualitativeValueId2.values.put(SEX_UNDEFINED.enumValue, SEX_UNDEFINED); - QualitativeValueId2.values.put(MATURITY_1.enumValue, MATURITY_1); - QualitativeValueId2.values.put(MATURITY_2.enumValue, MATURITY_2); - QualitativeValueId2.values.put(MATURITY_3.enumValue, MATURITY_3); - QualitativeValueId2.values.put(MATURITY_4.enumValue, MATURITY_4); - QualitativeValueId2.values.put(MATURITY_5.enumValue, MATURITY_5); - } - synchronized (QualitativeValueId2.valueList) { - QualitativeValueId2.valueList.add(SEX_UNDEFINED); - QualitativeValueId2.valueList.add(MATURITY_1); - QualitativeValueId2.valueList.add(MATURITY_2); - QualitativeValueId2.valueList.add(MATURITY_3); - QualitativeValueId2.valueList.add(MATURITY_4); - QualitativeValueId2.valueList.add(MATURITY_5); - // For Adagio, lists could be reload from configuration - // QualitativeValueId.valueList = Collections.unmodifiableList(valueList); - } - synchronized (QualitativeValueId2.literals) { - QualitativeValueId2.literals.add(SEX_UNDEFINED.enumValue); - QualitativeValueId2.literals.add(MATURITY_1.enumValue); - QualitativeValueId2.literals.add(MATURITY_2.enumValue); - QualitativeValueId2.literals.add(MATURITY_3.enumValue); - QualitativeValueId2.literals.add(MATURITY_4.enumValue); - QualitativeValueId2.literals.add(MATURITY_5.enumValue); - // For Adagio, lists could be reload from configuration - // QualitativeValueId.literals = Collections.unmodifiableList(literals); - } - synchronized (QualitativeValueId2.names) { - QualitativeValueId2.names.add("SEX_UNDEFINED"); - QualitativeValueId2.names.add("MATURITY_1"); - QualitativeValueId2.names.add("MATURITY_2"); - QualitativeValueId2.names.add("MATURITY_3"); - QualitativeValueId2.names.add("MATURITY_4"); - QualitativeValueId2.names.add("MATURITY_5"); - QualitativeValueId2.names = Collections.unmodifiableList(names); - } - } -} diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index 13cdfbf..4cdb1f2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.persistence; import com.google.common.base.Predicate; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -486,7 +486,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public List<Attachment> getAllAttachments(ObjectTypeCode2 objectType, + public List<Attachment> getAllAttachments(ObjectTypeCode objectType, Integer objectId) { return attachmentService.getAllAttachments(objectType, objectId); } @@ -512,7 +512,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public void deleteAllAttachment(ObjectTypeCode2 objectType, Integer... objectIds) { + public void deleteAllAttachment(ObjectTypeCode objectType, Integer... objectIds) { attachmentService.deleteAllAttachment(objectType, objectIds); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index e521e56..df5d7eb 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.persistence; import com.google.common.base.Predicate; import com.google.common.collect.Multimap; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -628,7 +628,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public List<Attachment> getAllAttachments(ObjectTypeCode2 objectType, + public List<Attachment> getAllAttachments(ObjectTypeCode objectType, Integer objectId) { throw notImplemented(); } @@ -691,7 +691,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteAllAttachment(ObjectTypeCode2 objectType, Integer... objectIds) { + public void deleteAllAttachment(ObjectTypeCode objectType, Integer... objectIds) { throw notImplemented(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java index 5e65ce3..5d2cbd8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java @@ -27,7 +27,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.nuiton.jaxx.application.ApplicationDataUtil; import java.util.Collection; import java.util.Collections; @@ -40,7 +39,7 @@ import java.util.Map; * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class TuttiEntities extends ApplicationDataUtil { +public class TuttiEntities { protected TuttiEntities() { // helper class does not instanciate diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index ea1a4a3..1ee7ef4 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -30,7 +30,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.io.Files; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.v1.SpeciesProtocol1; @@ -98,7 +97,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { // transform String to Integer... - Integer sampleCategoryIdToRemove = PmfmId2.SORTED_UNSORTED.getValue(); + Integer sampleCategoryIdToRemove = PmfmId.SORTED_UNSORTED.getValue(); if (!result.isBenthosEmpty()) { for (SpeciesProtocol speciesProtocol : result.getBenthos()) { @@ -260,16 +259,16 @@ public class TuttiProtocols extends AbstractTuttiProtocols { row.setMandatorySampleCategoryId(Lists.<Integer>newArrayList()); binderSpecies.copy(speciesProtocol1, row); if (speciesProtocol1.isAgeEnabled()) { - row.addMandatorySampleCategoryId(PmfmId2.AGE.getValue()); + row.addMandatorySampleCategoryId(PmfmId.AGE.getValue()); } if (speciesProtocol1.isSizeEnabled()) { - row.addMandatorySampleCategoryId(PmfmId2.SIZE_CATEGORY.getValue()); + row.addMandatorySampleCategoryId(PmfmId.SIZE_CATEGORY.getValue()); } if (speciesProtocol1.isMaturityEnabled()) { - row.addMandatorySampleCategoryId(PmfmId2.MATURITY.getValue()); + row.addMandatorySampleCategoryId(PmfmId.MATURITY.getValue()); } if (speciesProtocol1.isSexEnabled()) { - row.addMandatorySampleCategoryId(PmfmId2.SEX.getValue()); + row.addMandatorySampleCategoryId(PmfmId.SEX.getValue()); } result.addSpecies(row); } @@ -282,16 +281,16 @@ public class TuttiProtocols extends AbstractTuttiProtocols { row.setMandatorySampleCategoryId(Lists.<Integer>newArrayList()); binderSpecies.copy(speciesProtocol1, row); if (speciesProtocol1.isAgeEnabled()) { - row.addMandatorySampleCategoryId(PmfmId2.AGE.getValue()); + row.addMandatorySampleCategoryId(PmfmId.AGE.getValue()); } if (speciesProtocol1.isSizeEnabled()) { - row.addMandatorySampleCategoryId(PmfmId2.SIZE_CATEGORY.getValue()); + row.addMandatorySampleCategoryId(PmfmId.SIZE_CATEGORY.getValue()); } if (speciesProtocol1.isMaturityEnabled()) { - row.addMandatorySampleCategoryId(PmfmId2.MATURITY.getValue()); + row.addMandatorySampleCategoryId(PmfmId.MATURITY.getValue()); } if (speciesProtocol1.isSexEnabled()) { - row.addMandatorySampleCategoryId(PmfmId2.SEX.getValue()); + row.addMandatorySampleCategoryId(PmfmId.SEX.getValue()); } result.addBenthos(row); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java index 9001809..7b6ea94 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java @@ -34,8 +34,9 @@ import fr.ifremer.adagio.core.dao.data.sample.Sample; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.Matrix; -import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixId; import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixImpl; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; @@ -201,7 +202,7 @@ public class AccidentalBatchPersistenceServiceImpl extends AbstractPersistenceSe target.setLabel(label); // Matrix (product / batch) - Matrix matrix = load(MatrixImpl.class, MatrixId2.PRODUCT_BATCH.getValue()); + Matrix matrix = load(MatrixImpl.class, MatrixId.PRODUCE_BATCH.getValue()); target.setMatrix(matrix); // IndividualCount @@ -313,7 +314,7 @@ public class AccidentalBatchPersistenceServiceImpl extends AbstractPersistenceSe batch.setGender(genderValue); } - Float weight = (Float) result.remove(referentialService.getCaracteristic(PmfmId2.WEIGHT_MEASURED.getValue())); + Float weight = (Float) result.remove(referentialService.getCaracteristic(PmfmId.WEIGHT_MEASURED.getValue())); if (weight != null) { batch.setWeight(weight); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java index 85187f0..970d9e5 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceService.java @@ -22,7 +22,7 @@ package fr.ifremer.tutti.persistence.service; * #L% */ -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.data.Attachment; import org.springframework.transaction.annotation.Transactional; @@ -45,9 +45,9 @@ public interface AttachmentPersistenceService extends TuttiPersistenceServiceImp * @param objectType type of object. * @param objectId id of the object * @return list of all attachments for the given {@code objectId}. - * (see {@link ObjectTypeCode2}) + * (see {@link ObjectTypeCode}) */ - List<Attachment> getAllAttachments(ObjectTypeCode2 objectType, + List<Attachment> getAllAttachments(ObjectTypeCode objectType, Integer objectId); /** @@ -94,7 +94,7 @@ public interface AttachmentPersistenceService extends TuttiPersistenceServiceImp * @param objectIds ids of object */ @Transactional(readOnly = false) - void deleteAllAttachment(ObjectTypeCode2 objectType, + void deleteAllAttachment(ObjectTypeCode objectType, Integer... objectIds); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java index f6ee1d2..c1b48f8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java @@ -26,10 +26,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.data.measure.file.MeasurementFile; import fr.ifremer.adagio.core.dao.data.measure.file.MeasurementFileDao; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.adagio.core.dao.referential.ObjectTypeImpl; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; import org.apache.commons.lang3.ObjectUtils; @@ -89,7 +89,7 @@ public class AttachmentPersistenceServiceImpl extends AbstractPersistenceService //------------------------------------------------------------------------// @Override - public List<Attachment> getAllAttachments(ObjectTypeCode2 objectType, + public List<Attachment> getAllAttachments(ObjectTypeCode objectType, Integer objectId) { Iterator<Object[]> list = queryList( "allAttachment", @@ -243,7 +243,7 @@ public class AttachmentPersistenceServiceImpl extends AbstractPersistenceService } @Override - public void deleteAllAttachment(ObjectTypeCode2 objectType, Integer... objectIds) { + public void deleteAllAttachment(ObjectTypeCode objectType, Integer... objectIds) { for (Integer objectId : objectIds) { List<Attachment> attachments = getAllAttachments(objectType, objectId); for (Attachment attachment : attachments) { @@ -259,7 +259,7 @@ public class AttachmentPersistenceServiceImpl extends AbstractPersistenceService protected void loadAttachment(Object[] source, Attachment target) { - target.setObjectType(ObjectTypeCode2.valueOf((String) source[0])); + target.setObjectType(ObjectTypeCode.valueOf((String) source[0])); target.setObjectId((Integer) source[1]); target.setId(String.valueOf(source[2])); target.setPath((String) source[3]); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java index 77db23c..d98351a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java @@ -52,6 +52,7 @@ import fr.ifremer.adagio.core.dao.referential.location.Location; import fr.ifremer.adagio.core.dao.referential.location.LocationDao; import fr.ifremer.adagio.core.dao.referential.location.LocationImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmDao; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValue; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueDao; @@ -182,7 +183,7 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp Object[] source = queryUnique( "cruise", "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id), - "pmfmIdSurveyPart", IntegerType.INSTANCE, PmfmId2.SURVEY_PART.getValue()); + "pmfmIdSurveyPart", IntegerType.INSTANCE, PmfmId.SURVEY_PART.getValue()); if (source == null) { throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + id); @@ -244,7 +245,7 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp Iterator<Object[]> list = queryList( "allCruiseGears", "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id), - "pmfmIdTrawlNet", IntegerType.INSTANCE, PmfmId2.MULTIRIG_NUMBER.getValue()); + "pmfmIdTrawlNet", IntegerType.INSTANCE, PmfmId.MULTIRIG_NUMBER.getValue()); List<GearWithOriginalRankOrder> gears = Lists.newArrayList(); int maxMultirigNumberFound = 0; @@ -405,7 +406,7 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp GearPhysicalMeasurement measurement = list.next(); Integer pmfmId = measurement.getPmfm().getId(); - if (!PmfmId2.MULTIRIG_NUMBER.getValue().equals(pmfmId)) { + if (!PmfmId.MULTIRIG_NUMBER.getValue().equals(pmfmId)) { Caracteristic caracteristic = referentialService.getCaracteristic(pmfmId); Serializable value = null; @@ -468,7 +469,7 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp if (gpf.getGearPhysicalMeasurements() != null) { for (GearPhysicalMeasurement measurement : gpf.getGearPhysicalMeasurements()) { Integer pmfmId = measurement.getPmfm().getId(); - if (!PmfmId2.MULTIRIG_NUMBER.getValue().equals(pmfmId)) { + if (!PmfmId.MULTIRIG_NUMBER.getValue().equals(pmfmId)) { measurementsToRemove.add(pmfmId); } } @@ -635,11 +636,11 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp if (StringUtils.isEmpty(source.getSurveyPart())) { // remove surveyMeasurement if exists - measurementPersistenceHelper.removeSurveyMeasurement(fishingTrip, PmfmId2.SURVEY_PART.getValue()); + measurementPersistenceHelper.removeSurveyMeasurement(fishingTrip, PmfmId.SURVEY_PART.getValue()); } else { // update it or create it - measurementPersistenceHelper.setSurveyMeasurement(fishingTrip, PmfmId2.SURVEY_PART.getValue(), null, source.getSurveyPart(), null); + measurementPersistenceHelper.setSurveyMeasurement(fishingTrip, PmfmId.SURVEY_PART.getValue(), null, source.getSurveyPart(), null); } // Gear @@ -693,9 +694,9 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp // Trawl net (store in Gear Physical features) if (source.getMultirigNumber() == null) { - gearPhysicalFeaturesDao.removeGearPhysicalMeasurement(guf, PmfmId2.MULTIRIG_NUMBER.getValue()); + gearPhysicalFeaturesDao.removeGearPhysicalMeasurement(guf, PmfmId.MULTIRIG_NUMBER.getValue()); } else { - gearPhysicalFeaturesDao.setGearPhysicalMeasurement(target, guf, PmfmId2.MULTIRIG_NUMBER.getValue(), Float.valueOf(source.getMultirigNumber()), null, null); + gearPhysicalFeaturesDao.setGearPhysicalMeasurement(target, guf, PmfmId.MULTIRIG_NUMBER.getValue(), Float.valueOf(source.getMultirigNumber()), null, null); } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java index 544d231..cb42d2d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java @@ -29,7 +29,6 @@ import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocation; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocationDao; -import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocationImpl; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocationPK; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingAreaDao; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingAreaImpl; @@ -52,6 +51,7 @@ import fr.ifremer.adagio.core.dao.data.vessel.feature.use.GearUseFeatures; import fr.ifremer.adagio.core.dao.data.vessel.feature.use.VesselUseFeatures; import fr.ifremer.adagio.core.dao.data.vessel.feature.use.isActive; import fr.ifremer.adagio.core.dao.data.vessel.position.VesselPosition; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; import fr.ifremer.adagio.core.dao.referential.VesselPersonRole; @@ -60,10 +60,9 @@ import fr.ifremer.adagio.core.dao.referential.gear.GearImpl; import fr.ifremer.adagio.core.dao.referential.location.LocationExtendDao; import fr.ifremer.adagio.core.dao.referential.location.LocationImpl; import fr.ifremer.adagio.core.dao.referential.location.LocationLevelId; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; import fr.ifremer.adagio.core.service.referential.location.LocationService; import fr.ifremer.tutti.persistence.dao.GearPhysicalFeaturesDaoTutti; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; @@ -82,7 +81,6 @@ import fr.ifremer.tutti.persistence.service.util.SynchronizationStatusHelper; import fr.ifremer.tutti.persistence.service.util.VesselPersonFeaturesPersistenceHelper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -205,8 +203,8 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS Iterator<Object[]> list = queryList( "allFishingOperations", "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId), - "pmfmIdStationNumber", IntegerType.INSTANCE, PmfmId2.STATION_NUMBER.getValue(), - "pmfmIdMultirigAggregation", IntegerType.INSTANCE, PmfmId2.MULTIRIG_AGGREGATION.getValue() + "pmfmIdStationNumber", IntegerType.INSTANCE, PmfmId.STATION_NUMBER.getValue(), + "pmfmIdMultirigAggregation", IntegerType.INSTANCE, PmfmId.MULTIRIG_AGGREGATION.getValue() ); List<FishingOperation> result = Lists.newArrayList(); @@ -615,7 +613,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS getCurrentSession().flush(); attachmentPersistenceService.deleteAllAttachment( - ObjectTypeCode2.OPERATION, + ObjectTypeCode.OPERATION, fishingOperationId); } @@ -640,17 +638,17 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS Integer qualitativeValueId = (Integer) source[colIndex]; // Trawl distance - if (PmfmId2.TRAWL_DISTANCE.getValue().equals(pmfmId)) { + if (PmfmId.TRAWL_DISTANCE.getValue().equals(pmfmId)) { result.setTrawlDistance(numericalValue); } // Rectilinear operation ? - else if (PmfmId2.RECTILINEAR_OPERATION.getValue().equals(pmfmId)) { + else if (PmfmId.RECTILINEAR_OPERATION.getValue().equals(pmfmId)) { result.setFishingOperationRectiligne(QualitativeValueId.RECTILINEAR_OPERATION_YES.getValue().equals(qualitativeValueId)); } // Haul valid ? - else if (PmfmId2.HAUL_VALID.getValue().equals(pmfmId)) { + else if (PmfmId.HAUL_VALID.getValue().equals(pmfmId)) { if (qualitativeValueId != null) { result.setFishingOperationValid(QualitativeValueId.HAUL_VALID_YES.getValue().equals(qualitativeValueId)); } else { @@ -659,7 +657,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } // Station Number : - else if (PmfmId2.STATION_NUMBER.getValue().equals(pmfmId)) { + else if (PmfmId.STATION_NUMBER.getValue().equals(pmfmId)) { result.setStationNumber(alphanumericalValue); } @@ -706,7 +704,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS Integer qualitativeValueId = (Integer) source[colIndex]; // Trawl net number - if (PmfmId2.MULTIRIG_AGGREGATION.getValue().equals(pmfmId) + if (PmfmId.MULTIRIG_AGGREGATION.getValue().equals(pmfmId) && alphanumericalValue != null && alphanumericalValue.matches("\\d+")) { result.setMultirigAggregation(alphanumericalValue); @@ -874,7 +872,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Retrieve multirig number, from Gear physical features int cruiseMultirigCount = 1; // default value if (gearPhysicalFeatures != null) { - GearPhysicalMeasurement gpmMultirigCount = gearPhysicalFeaturesDao.getGearPhysicalMeasurement(gearPhysicalFeatures, PmfmId2.MULTIRIG_NUMBER.getValue()); + GearPhysicalMeasurement gpmMultirigCount = gearPhysicalFeaturesDao.getGearPhysicalMeasurement(gearPhysicalFeatures, PmfmId.MULTIRIG_NUMBER.getValue()); if (gpmMultirigCount != null && gpmMultirigCount.getNumericalValue() != null) { cruiseMultirigCount = gpmMultirigCount.getNumericalValue().intValue(); } @@ -882,7 +880,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // StationNumber if (source.getStationNumber() != null) { - VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId2.STATION_NUMBER.getValue(), null, source.getStationNumber(), null); + VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId.STATION_NUMBER.getValue(), null, source.getStationNumber(), null); notChangedVesselUseMeasurements.remove(vum); } @@ -901,7 +899,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } // Store into Gear Use Features - GearUseMeasurement gum = measurementPersistenceHelper.setGearUseMeasurement(scientificCruise, gearUseFeatures, PmfmId2.MULTIRIG_AGGREGATION.getValue(), null, source.getMultirigAggregation(), null); + GearUseMeasurement gum = measurementPersistenceHelper.setGearUseMeasurement(scientificCruise, gearUseFeatures, PmfmId.MULTIRIG_AGGREGATION.getValue(), null, source.getMultirigAggregation(), null); notChangedGearUseMeasurements.remove(gum); } @@ -929,19 +927,19 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Trawl distance if (source.getTrawlDistance() != null) { - VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId2.TRAWL_DISTANCE.getValue(), source.getTrawlDistance(), null, null); + VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId.TRAWL_DISTANCE.getValue(), source.getTrawlDistance(), null, null); notChangedVesselUseMeasurements.remove(vum); } // Rectilinear operation { - VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId2.RECTILINEAR_OPERATION.getValue(), null, null, source.isFishingOperationRectiligne() ? QualitativeValueId.RECTILINEAR_OPERATION_YES.getValue() : QualitativeValueId.RECTILINEAR_OPERATION_NO.getValue()); + VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId.RECTILINEAR_OPERATION.getValue(), null, null, source.isFishingOperationRectiligne() ? QualitativeValueId.RECTILINEAR_OPERATION_YES.getValue() : QualitativeValueId.RECTILINEAR_OPERATION_NO.getValue()); notChangedVesselUseMeasurements.remove(vum); } // Operation is valid ? if (source.getFishingOperationValid() != null) { - VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId2.HAUL_VALID.getValue(), null, null, source.getFishingOperationValid() ? QualitativeValueId.HAUL_VALID_YES.getValue() : QualitativeValueId.HAUL_VALID_NO.getValue()); + VesselUseMeasurement vum = measurementPersistenceHelper.setVesselUseMeasurement(scientificCruise, vesselUseFeatures, PmfmId.HAUL_VALID.getValue(), null, null, source.getFishingOperationValid() ? QualitativeValueId.HAUL_VALID_YES.getValue() : QualitativeValueId.HAUL_VALID_NO.getValue()); notChangedVesselUseMeasurements.remove(vum); } @@ -1143,7 +1141,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // ---------------------------------------------------------------- // Fishing Area : Strata, substrata, localite --- // ---------------------------------------------------------------- - + // Compute a statistical rectangle, using lat/long (to be used in FishingArea.location) Integer statisticalLocationId = null; if (source.getGearShootingStartLatitude() != null && source.getGearShootingStartLongitude() != null) { @@ -1155,11 +1153,11 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Strata : if (source.getStrata() != null && source.getStrata().getId() != null) { - FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, - source.getStrata().getIdAsInt(), - true /*create if need*/); + FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, + source.getStrata().getIdAsInt(), + true /*create if need*/); notChangedRegulationLocation.remove(fa2rl); - + // If no statistical location define yet, then use strata if (statisticalLocationId == null) { statisticalLocationId = source.getStrata().getIdAsInt(); @@ -1168,11 +1166,11 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Sub-Strata : if (source.getSubStrata() != null && source.getSubStrata().getId() != null) { - FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, - source.getSubStrata().getIdAsInt(), - true /*create if need*/); + FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, + source.getSubStrata().getIdAsInt(), + true /*create if need*/); notChangedRegulationLocation.remove(fa2rl); - + // If no statistical location define yet, then use sub-strata if (statisticalLocationId == null) { statisticalLocationId = source.getSubStrata().getIdAsInt(); @@ -1181,11 +1179,11 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Localite : if (source.getLocation() != null && source.getLocation().getId() != null) { - FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, - source.getLocation().getIdAsInt(), - true /*create if need*/); + FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, + source.getLocation().getIdAsInt(), + true /*create if need*/); notChangedRegulationLocation.remove(fa2rl); - + // If no statistical location define yet, then use Localité if (statisticalLocationId == null) { statisticalLocationId = source.getLocation().getIdAsInt(); @@ -1315,19 +1313,20 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS target.getOperationVesselAssociations().addAll(toAdd); } } - + /** - * Issue #4995 : use this method to avoid re-create of existing regulation location + * Issue #4995 : use this method to avoid re-create of existing regulation location + * * @param fishingArea * @param regulationLocationId * @param createIfNotExists * @return a entity FishingArea2RegulationLocation, or {@code null} if not found and createIfNotExists=false */ protected FishingArea2RegulationLocation getFishingArea2RegulationLocation(FishingArea fishingArea, - int regulationLocationId, - boolean createIfNotExists) { + int regulationLocationId, + boolean createIfNotExists) { Preconditions.checkNotNull(fishingArea); - + // Create the PK FishingArea2RegulationLocationPK pk = new FishingArea2RegulationLocationPK(); pk.setFishingArea((FishingAreaImpl) fishingArea); @@ -1336,7 +1335,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Retrieve existing regulation location FishingArea2RegulationLocation fa2rl = null; if (CollectionUtils.isNotEmpty(fishingArea.getRegulationLocations())) { - for(FishingArea2RegulationLocation existingFa2rl: fishingArea.getRegulationLocations()) { + for (FishingArea2RegulationLocation existingFa2rl : fishingArea.getRegulationLocations()) { FishingArea2RegulationLocationPK existingPk = existingFa2rl.getFishingArea2RegulationLocationPk(); if (Objects.equals(existingPk, pk)) { fa2rl = existingFa2rl; @@ -1344,7 +1343,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } } } - + // If not exists, create if need if (fa2rl != null || !createIfNotExists) { return fa2rl; @@ -1358,7 +1357,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } else { fishingArea.getRegulationLocations().add(fa2rl); } - + return fa2rl; } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java index 56b26a2..849ebb8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java @@ -36,7 +36,7 @@ import fr.ifremer.adagio.core.dao.data.sample.Sample; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.Matrix; -import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixId; import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixImpl; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; @@ -230,7 +230,7 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe target.setLabel(label); // Matrix (product / batch) - Matrix matrix = load(MatrixImpl.class, MatrixId2.PRODUCT_BATCH.getValue()); + Matrix matrix = load(MatrixImpl.class, MatrixId.PRODUCE_BATCH.getValue()); target.setMatrix(matrix); // IndividualCount diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java index 62c9533..c89a2f2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java @@ -41,6 +41,7 @@ import fr.ifremer.adagio.core.dao.referential.location.LocationClassificationId; import fr.ifremer.adagio.core.dao.referential.location.LocationExtendDao; import fr.ifremer.adagio.core.dao.referential.location.LocationLabel; import fr.ifremer.adagio.core.dao.referential.location.LocationLevelId; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.adagio.core.dao.referential.pmfm.UnitId; @@ -137,19 +138,19 @@ public class ReferentialPersistenceServiceImpl extends AbstractPersistenceServic super.init(); batchVracPredicate = SpeciesAbleBatchs.newSpeciesAbleBatchCategoryPredicate( - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_VRAC.getValue()); // init protected pmfm ids propertedPmfmIds = Sets.newHashSet( - PmfmId2.MULTIRIG_AGGREGATION.getValue(), - PmfmId2.MULTIRIG_NUMBER.getValue(), - PmfmId2.STATION_NUMBER.getValue(), - PmfmId2.RECTILINEAR_OPERATION.getValue(), - PmfmId2.HAUL_VALID.getValue(), - PmfmId2.TRAWL_DISTANCE.getValue(), - PmfmId2.SURVEY_PART.getValue(), - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.MULTIRIG_AGGREGATION.getValue(), + PmfmId.MULTIRIG_NUMBER.getValue(), + PmfmId.STATION_NUMBER.getValue(), + PmfmId.RECTILINEAR_OPERATION.getValue(), + PmfmId.HAUL_VALID.getValue(), + PmfmId.TRAWL_DISTANCE.getValue(), + PmfmId.SURVEY_PART.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), PmfmId2.ID_PSFM.getValue() ); } @@ -596,21 +597,21 @@ public class ReferentialPersistenceServiceImpl extends AbstractPersistenceServic @Override public Caracteristic getSizeCategoryCaracteristic() { - Integer pmfmId = PmfmId2.SIZE_CATEGORY.getValue(); + Integer pmfmId = PmfmId.SIZE_CATEGORY.getValue(); Caracteristic result = getCaracteristic(pmfmId); return result; } @Override public Caracteristic getSexCaracteristic() { - Integer pmfmId = PmfmId2.SEX.getValue(); + Integer pmfmId = PmfmId.SEX.getValue(); Caracteristic result = getCaracteristic(pmfmId); return result; } @Override public Caracteristic getSortedUnsortedCaracteristic() { - Integer pmfmId = PmfmId2.SORTED_UNSORTED.getValue(); + Integer pmfmId = PmfmId.SORTED_UNSORTED.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); // Search the qualitative value to skip @@ -631,56 +632,56 @@ public class ReferentialPersistenceServiceImpl extends AbstractPersistenceServic @Override public Caracteristic getMaturityCaracteristic() { - Integer pmfmId = PmfmId2.MATURITY.getValue(); + Integer pmfmId = PmfmId.MATURITY.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } @Override public Caracteristic getAgeCaracteristic() { - Integer pmfmId = PmfmId2.AGE.getValue(); + Integer pmfmId = PmfmId.AGE.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } @Override public Caracteristic getMarineLitterCategoryCaracteristic() { - Integer pmfmId = PmfmId2.MARINE_LITTER_TYPE.getValue(); + Integer pmfmId = PmfmId.MARINE_LITTER_TYPE.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } @Override public Caracteristic getMarineLitterSizeCategoryCaracteristic() { - Integer pmfmId = PmfmId2.MARINE_LITTER_SIZE_CATEGORY.getValue(); + Integer pmfmId = PmfmId.MARINE_LITTER_SIZE_CATEGORY.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } @Override public Caracteristic getVerticalOpeningCaracteristic() { - Integer pmfmId = PmfmId2.VERTICAL_OPENING.getValue(); + Integer pmfmId = PmfmId.VERTICAL_OPENING.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } @Override public Caracteristic getHorizontalOpeningWingsCaracteristic() { - Integer pmfmId = PmfmId2.HORIZONTAL_OPENING_WINGS.getValue(); + Integer pmfmId = PmfmId.HORIZONTAL_OPENING_WINGS.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } @Override public Caracteristic getHorizontalOpeningDoorCaracteristic() { - Integer pmfmId = PmfmId2.HORIZONTAL_OPENING_DOOR.getValue(); + Integer pmfmId = PmfmId.HORIZONTAL_OPENING_DOOR.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } @Override public Caracteristic getDeadOrAliveCaracteristic() { - Integer pmfmId = PmfmId2.DEAD_OR_ALIVE.getValue(); + Integer pmfmId = PmfmId.DEAD_OR_ALIVE.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } @@ -694,7 +695,7 @@ public class ReferentialPersistenceServiceImpl extends AbstractPersistenceServic @Override public Caracteristic getWeightMeasuredCaracteristic() { - Integer pmfmId = PmfmId2.WEIGHT_MEASURED.getValue(); + Integer pmfmId = PmfmId.WEIGHT_MEASURED.getValue(); Caracteristic result = thisService.getCaracteristic(pmfmId); return result; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java index 623393d..9654452 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java @@ -36,11 +36,11 @@ import fr.ifremer.adagio.core.dao.data.batch.validator.CatchBatchValidationExcep import fr.ifremer.adagio.core.dao.data.measure.SortingMeasurement; import fr.ifremer.adagio.core.dao.data.operation.FishingOperation; import fr.ifremer.adagio.core.dao.data.operation.FishingOperationDao; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; import fr.ifremer.adagio.core.dao.referential.pmfm.Pmfm; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxon; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; @@ -190,7 +190,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { getCurrentSession().flush(); attachmentPersistenceService.deleteAllAttachment( - ObjectTypeCode2.BATCH, + ObjectTypeCode.BATCH, ids.toArray(new Integer[ids.size()])); } @@ -208,7 +208,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { catchBatchDao.removeWithChildren(batchId); attachmentPersistenceService.deleteAllAttachment( - ObjectTypeCode2.BATCH, + ObjectTypeCode.BATCH, ids.toArray(new Integer[ids.size()])); } @@ -218,7 +218,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { catchBatchDao.removeWithChildren(batchId, parentCatchBatch); attachmentPersistenceService.deleteAllAttachment( - ObjectTypeCode2.BATCH, + ObjectTypeCode.BATCH, ids.toArray(new Integer[ids.size()])); } @@ -282,13 +282,13 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { if (validate) { try { - result = catchBatchDao.loadFullTree(catchBatchId, PmfmId2.WEIGHT_MEASURED.getValue(), true, false); + result = catchBatchDao.loadFullTree(catchBatchId, PmfmId.WEIGHT_MEASURED.getValue(), true, false); } catch (CatchBatchValidationException e) { throw new InvalidBatchModelException( "L'arbre d'échantillonage n'est pas compatible avec celui de Tutti.", e); } } else { - result = catchBatchDao.loadFullTree(catchBatchId, PmfmId2.WEIGHT_MEASURED.getValue()); + result = catchBatchDao.loadFullTree(catchBatchId, PmfmId.WEIGHT_MEASURED.getValue()); } Preconditions.checkNotNull(result); return result; @@ -311,7 +311,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { // whenever want to repair anything from Tutti fr.ifremer.adagio.core.dao.data.batch.CatchBatch result; - result = catchBatchDao.loadFullTree(catchBatchId, PmfmId2.WEIGHT_MEASURED.getValue()); + result = catchBatchDao.loadFullTree(catchBatchId, PmfmId.WEIGHT_MEASURED.getValue()); Preconditions.checkNotNull(result); return result; @@ -337,11 +337,11 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { // Or retrieve parent batch, from pmfm id // Retrieve category type - if (!sampleCategoryId.equals(PmfmId2.SORTED_UNSORTED.getValue())) { + if (!sampleCategoryId.equals(PmfmId.SORTED_UNSORTED.getValue())) { throw new DataIntegrityViolationException(MessageFormat.format( "A species or benthos batch with no parent should have a sampleCategoryType {0} (PMFM.ID={1})", sampleCategoryId, - PmfmId2.SORTED_UNSORTED.getValue())); + PmfmId.SORTED_UNSORTED.getValue())); } Integer qualitativeValueId = convertSampleCategoryValueIntoQualitativeId(sampleCategoryValue); @@ -416,11 +416,11 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { // Or retrieve parent batch, from pmfm id // Retrieve category type - if (!sampleCategoryType.equals(PmfmId2.SORTED_UNSORTED.getValue())) { + if (!sampleCategoryType.equals(PmfmId.SORTED_UNSORTED.getValue())) { throw new DataIntegrityViolationException(MessageFormat.format( "A species or benthos batch with no parent should have a sampleCategoryType {0} (PMFM.ID={1})", sampleCategoryType, - PmfmId2.SORTED_UNSORTED.getValue())); + PmfmId.SORTED_UNSORTED.getValue())); } Integer qualitativeValueId = convertSampleCategoryValueIntoQualitativeId(sampleCategoryValue); @@ -619,7 +619,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { if (source.getSampleCategoryId() != null && source.getSampleCategoryValue() != null) { Integer pmfmId = source.getSampleCategoryId(); // Do not store sorting measurement if pmfm = SORTED (already store in an ancestor batch) - if (!pmfmId.equals(PmfmId2.SORTED_UNSORTED.getValue())) { + if (!pmfmId.equals(PmfmId.SORTED_UNSORTED.getValue())) { SortingMeasurement sortingMeasurement = measurementPersistenceHelper.setSortingMeasurement( target, pmfmId, diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java index b94a766..c54c555 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java @@ -33,7 +33,7 @@ import fr.ifremer.adagio.core.dao.data.measure.QuantificationMeasurement; import fr.ifremer.adagio.core.dao.data.measure.SortingMeasurement; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxon; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; @@ -65,9 +65,9 @@ import java.util.Set; @Component("batchTreeHelper") public class BatchTreeHelper extends AbstractPersistenceService { - public static final Integer SORTING_TYPE_ID = PmfmId2.SCIENTIFIC_CRUISE_SORTING_TYPE.getValue(); + public static final Integer SORTING_TYPE_ID = PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE.getValue(); - public static final Integer SORTING_TYPE2_ID = PmfmId2.SCIENTIFIC_CRUISE_SORTING_TYPE2.getValue(); + public static final Integer SORTING_TYPE2_ID = PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE2.getValue(); /** Logger. */ private static final Log log = LogFactory.getLog(BatchTreeHelper.class); @@ -88,7 +88,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { return getSortingBatch( batch, "Vrac > Species > Alive Itemized", - PmfmId2.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_VRAC.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_VRAC.getValue(), SORTING_TYPE_ID, QualitativeValueId.SORTING_TYPE_SPECIES.getValue(), SORTING_TYPE2_ID, QualitativeValueId.SORTING_TYPE2_ALIVE_ITEMIZED.getValue() ); @@ -98,7 +98,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { return getSortingBatch( batch, "Vrac > Benthos > Alive itemized", - PmfmId2.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_VRAC.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_VRAC.getValue(), SORTING_TYPE_ID, QualitativeValueId.SORTING_TYPE_BENTHOS.getValue(), SORTING_TYPE2_ID, QualitativeValueId.SORTING_TYPE2_ALIVE_ITEMIZED.getValue() ); @@ -108,7 +108,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { return getSortingBatch( batch, "Hors Vrac > Species", - PmfmId2.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_HORS_VRAC.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_HORS_VRAC.getValue(), SORTING_TYPE_ID, QualitativeValueId.SORTING_TYPE_SPECIES.getValue() ); } @@ -117,7 +117,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { return getSortingBatch( batch, "Hors Vrac > Benthos", - PmfmId2.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_HORS_VRAC.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_HORS_VRAC.getValue(), SORTING_TYPE_ID, QualitativeValueId.SORTING_TYPE_BENTHOS.getValue() ); } @@ -126,7 +126,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { return getSortingBatch( batch, "Hors Vrac > Marine Litter", - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_HORS_VRAC.getValue(), SORTING_TYPE_ID, QualitativeValueId.SORTING_TYPE_MARINE_LITTER.getValue() @@ -137,7 +137,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { return getSortingBatch( batch, "Vrac", - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_VRAC.getValue() ); } @@ -146,7 +146,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { return getSortingBatch( batch, "Hors Vrac", - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_HORS_VRAC.getValue() ); } @@ -155,7 +155,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { return getSortingBatch( batch, "Unsorted", - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.UNSORTED.getValue() ); } @@ -274,7 +274,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { batch, batch, "Vrac", - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_VRAC.getValue(), weight, weightBeforeSampling, @@ -395,7 +395,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { batch, batch, "Hors Vrac", - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.SORTED_HORS_VRAC.getValue(), (short) 2 ); @@ -446,7 +446,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { batch, batch, "Unsorted", - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.UNSORTED.getValue(), weight, (short) 3 @@ -458,7 +458,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { catchBatchDao.setSortingBatchWeights(target, weight, weightBeforeSampling, - PmfmId2.WEIGHT_MEASURED.getValue(), + PmfmId.WEIGHT_MEASURED.getValue(), measurementPersistenceHelper.getRecorderDepartmentId()); } @@ -466,8 +466,8 @@ public class BatchTreeHelper extends AbstractPersistenceService { public void setSortingSamplingRatio(SortingBatch target, Float weight, Float weightBeforeSampling) { catchBatchDao.setSortingSamplingRatio(target, - weight, - weightBeforeSampling); + weight, + weightBeforeSampling); } @@ -733,7 +733,7 @@ public class BatchTreeHelper extends AbstractPersistenceService { } public CatchBatch loadCatchBatch(Integer catchBatchId) { - return catchBatchDao.loadFullTreeWithCache(catchBatchId, PmfmId2.WEIGHT_MEASURED.getValue(), true, true); + return catchBatchDao.loadFullTreeWithCache(catchBatchId, PmfmId.WEIGHT_MEASURED.getValue(), true, true); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java index c2aadba..64de421 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java @@ -41,7 +41,7 @@ import fr.ifremer.adagio.core.dao.data.vessel.feature.use.VesselUseFeatures; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.Pmfm; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValue; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; @@ -126,7 +126,7 @@ public class MeasurementPersistenceHelper extends AbstractPersistenceService { notChangedQuantificationMeasurements.addAll(quantificationMeasurements); } - QuantificationMeasurement quantificationMeasurement = catchBatchDao.setQuantificationMeasurement(batch, PmfmId2.WEIGHT_MEASURED.getValue(), getRecorderDepartmentId(), weightValue, true); + QuantificationMeasurement quantificationMeasurement = catchBatchDao.setQuantificationMeasurement(batch, PmfmId.WEIGHT_MEASURED.getValue(), getRecorderDepartmentId(), weightValue, true); // Removed not changed measurements (in sorting and quantification measurement lists) if (quantificationMeasurements != null) { @@ -137,12 +137,12 @@ public class MeasurementPersistenceHelper extends AbstractPersistenceService { } public QuantificationMeasurement getWeightMeasurementQuantificationMeasurement(Batch batch) { - QuantificationMeasurement quantificationMeasurement = catchBatchDao.getQuantificationMeasurement(batch, PmfmId2.WEIGHT_MEASURED.getValue()); + QuantificationMeasurement quantificationMeasurement = catchBatchDao.getQuantificationMeasurement(batch, PmfmId.WEIGHT_MEASURED.getValue()); return quantificationMeasurement; } public SortingMeasurement getInheritedSortingMeasurement(SortingBatch sortingBatch) { - return catchBatchDao.getInheritedSortingMeasurement(sortingBatch, PmfmId2.SORTED_UNSORTED.getValue()); + return catchBatchDao.getInheritedSortingMeasurement(sortingBatch, PmfmId.SORTED_UNSORTED.getValue()); } //------------------------------------------------------------------------// diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java index aa335bb..595f6d3 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java @@ -26,9 +26,9 @@ import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.data.measure.SampleMeasurement; import fr.ifremer.adagio.core.dao.data.sample.Sample; import fr.ifremer.adagio.core.dao.data.sample.SampleDao; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmImpl; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -103,7 +103,7 @@ public class SamplePersistenceHelper extends AbstractPersistenceService { sample.getSampleMeasurements().clear(); sampleDao.remove(sample); - attachmentPersistenceService.deleteAllAttachment(ObjectTypeCode2.SAMPLE, sampleId); + attachmentPersistenceService.deleteAllAttachment(ObjectTypeCode.SAMPLE, sampleId); } public void setSampleMeasurements(Sample target, diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/DateTimes.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/DateTimes.java new file mode 100644 index 0000000..476871a --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/DateTimes.java @@ -0,0 +1,46 @@ +package fr.ifremer.tutti.util; + +import org.apache.commons.lang3.time.DurationFormatUtils; + +import java.util.Calendar; +import java.util.Date; + +/** + * Created on 9/5/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.8 + */ +public class DateTimes { + + public static String getDuration(Date startDate, + Date endDate, + String format) { + String duration = ""; + if (startDate != null && endDate != null && !startDate.after(endDate)) { + duration = DurationFormatUtils.formatPeriod( + startDate.getTime(), + endDate.getTime(), + format); + } + return duration; + } + + /** + * Enleve les données des heures (hour, minute, second, milli = 0). + * + * @param date la date a modifier + * @return la date d'un jour + */ + public static Date getDay(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.MILLISECOND, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.HOUR_OF_DAY, 0); + date = calendar.getTime(); + return date; + } + +} diff --git a/tutti-persistence/src/main/resources/tutti-db-enumerations.properties b/tutti-persistence/src/main/resources/tutti-db-enumerations.properties index 4c4ecf8..812f518 100644 --- a/tutti-persistence/src/main/resources/tutti-db-enumerations.properties +++ b/tutti-persistence/src/main/resources/tutti-db-enumerations.properties @@ -29,17 +29,10 @@ # PSFM "Pour référencer un autre id de pmfm" PmfmId.ID_PSFM=1433 -MatrixId.PRODUCT_BATCH=1 +#TODO Remove this when using adagio > 3.6.2 +MatrixId.PRODUCE_BATCH=1 +#TODO Remove this when using adagio > 3.6.2 ObjectTypeCode.CATCH_BATCH=CATCH_BATCH -QualitativeValueId.SEX_UNDEFINED=299 -QualitativeValueId.MATURITY_1=272 -QualitativeValueId.MATURITY_2=273 -QualitativeValueId.MATURITY_3=274 -QualitativeValueId.MATURITY_4=275 -QualitativeValueId.MATURITY_5=276 -QualitativeValueId.SORTING_TYPE_2_ALIVE_NOT_ITEMIZED=2161 -QualitativeValueId.SORTING_TYPE_2_INERT=2162 -QualitativeValueId.SORTING_TYPE_2_ALIVE_ITEMIZED=2160 UserProfilId.DEPARTEMENT_PREFIX=PDG- diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 1713aa3..3f7f384 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java index dc6fec7..0814f56 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceWriteTest.java @@ -22,7 +22,7 @@ package fr.ifremer.tutti.persistence.service; * #L% */ -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; import fr.ifremer.tutti.persistence.test.DatabaseResource; @@ -60,7 +60,7 @@ public class AttachmentPersistenceServiceWriteTest { Integer cruiseId = Integer.valueOf(dbResource.getFixtures().cruiseId()); allAttachments = service.getAllAttachments( - ObjectTypeCode2.SCIENTIFIC_CRUISE, cruiseId); + ObjectTypeCode.SCIENTIFIC_CRUISE, cruiseId); Assert.assertTrue(allAttachments.isEmpty()); // @@ -68,7 +68,7 @@ public class AttachmentPersistenceServiceWriteTest { // Attachment attachment = Attachments.newAttachment(); - attachment.setObjectType(ObjectTypeCode2.SCIENTIFIC_CRUISE); + attachment.setObjectType(ObjectTypeCode.SCIENTIFIC_CRUISE); attachment.setObjectId(cruiseId); long buildTime = System.nanoTime(); attachment.setName("AttachmentName-" + buildTime); @@ -91,7 +91,7 @@ public class AttachmentPersistenceServiceWriteTest { // allAttachments = service.getAllAttachments( - ObjectTypeCode2.SCIENTIFIC_CRUISE, cruiseId); + ObjectTypeCode.SCIENTIFIC_CRUISE, cruiseId); Assert.assertFalse(allAttachments.isEmpty()); Assert.assertEquals(1, allAttachments.size()); @@ -113,7 +113,7 @@ public class AttachmentPersistenceServiceWriteTest { // allAttachments = service.getAllAttachments( - ObjectTypeCode2.SCIENTIFIC_CRUISE, cruiseId); + ObjectTypeCode.SCIENTIFIC_CRUISE, cruiseId); Assert.assertFalse(allAttachments.isEmpty()); Assert.assertEquals(1, allAttachments.size()); @@ -126,7 +126,7 @@ public class AttachmentPersistenceServiceWriteTest { service.deleteAttachment(attachment.getId()); allAttachments = service.getAllAttachments( - ObjectTypeCode2.SCIENTIFIC_CRUISE, cruiseId); + ObjectTypeCode.SCIENTIFIC_CRUISE, cruiseId); Assert.assertTrue(allAttachments.isEmpty()); Assert.assertFalse(attachmentFile.exists()); } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java index 2cc1c38..2a53285 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.persistence.service; */ import com.google.common.collect.Maps; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -116,7 +116,7 @@ public class BenthosBatchPersistenceServiceReadTest { // Check species only if Vrac/HorsVrac or if batch has been load throw getAllxxx method // (Because getBenthosBatch(id) could not always retrieve the species) if (expectedBatch.getSpecies() != null && ( - PmfmId2.SORTED_UNSORTED.getValue().equals(expectedBatch.getSampleCategoryId()) + PmfmId.SORTED_UNSORTED.getValue().equals(expectedBatch.getSampleCategoryId()) || actualBatch.getSpecies() != null)) { assertNotNull(actualBatch.getSpecies()); assertEquals(expectedBatch.getSpecies().getId(), actualBatch.getSpecies().getId()); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java index 10db123..e4aa0f3 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.persistence.service; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequencys; @@ -217,7 +217,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setParentBatch(null); batch.setFishingOperation(fishingOperationNoCatchBatch); batch.setSpecies(taxon1); - batch.setSampleCategoryId(PmfmId2.SORTED_UNSORTED.getValue()); + batch.setSampleCategoryId(PmfmId.SORTED_UNSORTED.getValue()); batch.setSampleCategoryValue(vracQualitativeValue); batch.setSampleCategoryWeight(5f); @@ -235,7 +235,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setParentBatch(esp1Batch); batch.setSpecies(taxon1); batch.setComment("ESP1 - Vrac/5 Male/2 ss-ech/1 Nombre/7"); - batch.setSampleCategoryId(PmfmId2.SEX.getValue()); + batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(maleQualitativeValue); batch.setSampleCategoryWeight(2f); batch.setWeight(1f); @@ -252,7 +252,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setParentBatch(esp1Batch); batch.setSpecies(taxon1); batch.setComment("ESP1 - Vrac/5 Female/3 Nombre/14"); - batch.setSampleCategoryId(PmfmId2.SEX.getValue()); + batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(femaleQualitativeValue); batch.setSampleCategoryWeight(3f); batch.setWeight(null); @@ -268,7 +268,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch = BenthosBatchs.newBenthosBatch(); batch.setParentBatch(null); batch.setSpecies(taxon2); - batch.setSampleCategoryId(PmfmId2.SORTED_UNSORTED.getValue()); + batch.setSampleCategoryId(PmfmId.SORTED_UNSORTED.getValue()); batch.setSampleCategoryValue(vracQualitativeValue); batch.setSampleCategoryWeight(7f); @@ -281,7 +281,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setParentBatch(esp2Batch); batch.setSpecies(taxon2); batch.setComment("ESP2 - Vrac/7 UNK/2 ss-ech/1 Nombre/11"); - batch.setSampleCategoryId(PmfmId2.MATURITY.getValue()); + batch.setSampleCategoryId(PmfmId.MATURITY.getValue()); batch.setSampleCategoryValue(firstMaturityQualitativeValue); batch.setSampleCategoryWeight(2f); batch.setWeight(1f); @@ -294,7 +294,7 @@ public class BenthosBatchPersistenceServiceWriteTest { // ----------------------------------------------------------------------------- // Batch : ESP2 - Vrac/7 UNK/1.75 ss-ech/1.11 Nombre/99 batch.setComment("ESP2 - Vrac/7 UNK/1.75 ss-ech/1.11 Nombre/99"); - batch.setSampleCategoryId(PmfmId2.SEX.getValue()); + batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(unkQualitativeValue); batch.setSampleCategoryWeight(1.75f); batch.setWeight(1.11f); @@ -380,7 +380,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setParentBatch(null); batch.setFishingOperation(fishingOperationWithEmptyBatch); batch.setSpecies(taxon1); - batch.setSampleCategoryId(PmfmId2.SORTED_UNSORTED.getValue()); + batch.setSampleCategoryId(PmfmId.SORTED_UNSORTED.getValue()); batch.setSampleCategoryValue(vracQualitativeValue); batch.setSampleCategoryWeight(5f); assertCreateAndReloadBenthosBatch(batch, null); @@ -391,7 +391,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setParentBatch(esp1Batch); batch.setFishingOperation(fishingOperationWithEmptyBatch); batch.setSpecies(taxon1); - batch.setSampleCategoryId(PmfmId2.SEX.getValue()); + batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(maleQualitativeValue); batch.setSampleCategoryWeight(2f); assertCreateAndReloadBenthosBatch(batch, esp1Batch.getId()); @@ -454,7 +454,7 @@ public class BenthosBatchPersistenceServiceWriteTest { // Check species only if Vrac/HorsVrac or if batch has been load throw getAllxxx method // (Because getBenthosBatch(id) could not always retrieve the species) if (expectedBatch.getSpecies() != null && ( - PmfmId2.SORTED_UNSORTED.getValue().equals(expectedBatch.getSampleCategoryId()) + PmfmId.SORTED_UNSORTED.getValue().equals(expectedBatch.getSampleCategoryId()) || actualBatch.getSpecies() != null)) { assertNotNull(actualBatch.getSpecies()); assertEquals(expectedBatch.getSpecies().getId(), actualBatch.getSpecies().getId()); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java index 56a08b5..e5c7871 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.persistence.service; */ import com.google.common.collect.Maps; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; @@ -120,7 +120,7 @@ public class SpeciesBatchPersistenceServiceReadTest { // Check species only if Vrac/HorsVrac or if batch has been load throw getAllxxx method // (Because getSpeciesBatch(id) could not always retrieve the species) if (expectedBatch.getSpecies() != null && ( - PmfmId2.SORTED_UNSORTED.getValue().equals(expectedBatch.getSampleCategoryId()) + PmfmId.SORTED_UNSORTED.getValue().equals(expectedBatch.getSampleCategoryId()) || actualBatch.getSpecies() != null)) { assertNotNull(actualBatch.getSpecies()); assertEquals(expectedBatch.getSpecies().getId(), actualBatch.getSpecies().getId()); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java index 37d6ac0..1b90972 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.persistence.service; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.CatchBatchs; @@ -209,7 +209,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setParentBatch(null); batch.setFishingOperation(fishingOperationNoCatchBatch); batch.setSpecies(taxon1); - batch.setSampleCategoryId(PmfmId2.SORTED_UNSORTED.getValue()); + batch.setSampleCategoryId(PmfmId.SORTED_UNSORTED.getValue()); batch.setSampleCategoryValue(vracQualitativeValue); batch.setSampleCategoryWeight(5f); @@ -227,7 +227,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setParentBatch(esp1Batch); batch.setSpecies(taxon1); batch.setComment("ESP1 - Vrac/5 Male/2 ss-ech/1 Nombre/7"); - batch.setSampleCategoryId(PmfmId2.SEX.getValue()); + batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(maleQualitativeValue); batch.setSampleCategoryWeight(2f); batch.setWeight(1f); @@ -244,7 +244,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setParentBatch(esp1Batch); batch.setSpecies(taxon1); batch.setComment("ESP1 - Vrac/5 Female/3 Nombre/14"); - batch.setSampleCategoryId(PmfmId2.SEX.getValue()); + batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(femaleQualitativeValue); batch.setSampleCategoryWeight(3f); batch.setWeight(null); @@ -260,7 +260,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch = SpeciesBatchs.newSpeciesBatch(); batch.setParentBatch(null); batch.setSpecies(taxon2); - batch.setSampleCategoryId(PmfmId2.SORTED_UNSORTED.getValue()); + batch.setSampleCategoryId(PmfmId.SORTED_UNSORTED.getValue()); batch.setSampleCategoryValue(vracQualitativeValue); batch.setSampleCategoryWeight(7f); @@ -273,7 +273,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setParentBatch(esp2Batch); batch.setSpecies(taxon2); batch.setComment("ESP2 - Vrac/7 UNK/2 ss-ech/1 Nombre/11"); - batch.setSampleCategoryId(PmfmId2.MATURITY.getValue()); + batch.setSampleCategoryId(PmfmId.MATURITY.getValue()); batch.setSampleCategoryValue(firstMaturityQualitativeValue); batch.setSampleCategoryWeight(2f); batch.setWeight(1f); @@ -286,7 +286,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { // ----------------------------------------------------------------------------- // Batch : ESP2 - Vrac/7 UNK/1.75 ss-ech/1.11 Nombre/99 batch.setComment("ESP2 - Vrac/7 UNK/1.75 ss-ech/1.11 Nombre/99"); - batch.setSampleCategoryId(PmfmId2.SEX.getValue()); + batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(unkQualitativeValue); batch.setSampleCategoryWeight(1.75f); batch.setWeight(1.11f); @@ -373,7 +373,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setParentBatch(null); batch.setFishingOperation(fishingOperationWithEmptyBatch); batch.setSpecies(taxon1); - batch.setSampleCategoryId(PmfmId2.SORTED_UNSORTED.getValue()); + batch.setSampleCategoryId(PmfmId.SORTED_UNSORTED.getValue()); batch.setSampleCategoryValue(vracQualitativeValue); batch.setSampleCategoryWeight(5f); assertCreateAndReloadSpeciesBatch(batch, null); @@ -384,7 +384,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setParentBatch(esp1Batch); batch.setFishingOperation(fishingOperationWithEmptyBatch); batch.setSpecies(taxon1); - batch.setSampleCategoryId(PmfmId2.SEX.getValue()); + batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(maleQualitativeValue); batch.setSampleCategoryWeight(2f); assertCreateAndReloadSpeciesBatch(batch, esp1Batch.getId()); @@ -447,7 +447,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { // Check species only if Vrac/HorsVrac or if batch has been load throw getAllxxx method // (Because getSpeciesBatch(id) could not always retrieve the species) if (expectedBatch.getSpecies() != null && ( - PmfmId2.SORTED_UNSORTED.getValue().equals(expectedBatch.getSampleCategoryId()) + PmfmId.SORTED_UNSORTED.getValue().equals(expectedBatch.getSampleCategoryId()) || actualBatch.getSpecies() != null)) { assertNotNull(actualBatch.getSpecies()); assertEquals(expectedBatch.getSpecies().getId(), actualBatch.getSpecies().getId()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index cfb9195..f010359 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -28,7 +28,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.InvalidBatchModelException; import fr.ifremer.tutti.persistence.TuttiPersistence; @@ -113,7 +113,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer init(); } - public <E extends TuttiReferentialEntity> List<E> retainTemporaryList(List<E> targetList) { + public <E extends TuttiReferentialEntity> List<E> retainTemporaryList(List<E> targetList) { List<E> sourceList = new ArrayList<>(); Iterator<E> iterator = targetList.iterator(); while (iterator.hasNext()) { @@ -991,7 +991,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public List<Attachment> getAllAttachments(ObjectTypeCode2 objectType, + public List<Attachment> getAllAttachments(ObjectTypeCode objectType, Integer objectId) { return driver.getAllAttachments(objectType, objectId); } @@ -1017,7 +1017,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public void deleteAllAttachment(ObjectTypeCode2 objectType, Integer... objectIds) { + public void deleteAllAttachment(ObjectTypeCode objectType, Integer... objectIds) { driver.deleteAllAttachment(objectType, objectIds); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java index 8992acb..bb8b1a8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.service.catches.multipost; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -244,7 +244,7 @@ public class MultiPostExportService extends AbstractTuttiService { addAttachments(id, batch.getIdAsInt(), - ObjectTypeCode2.BATCH, + ObjectTypeCode.BATCH, attachmentRows); } @@ -329,7 +329,7 @@ public class MultiPostExportService extends AbstractTuttiService { caracteristicRows.add(caracteristicRow); } - addAttachments(id, batch.getIdAsInt(), ObjectTypeCode2.SAMPLE, attachmentRows); + addAttachments(id, batch.getIdAsInt(), ObjectTypeCode.SAMPLE, attachmentRows); } File directory = Files.createTempDir(); @@ -418,7 +418,7 @@ public class MultiPostExportService extends AbstractTuttiService { caracteristicRows.add(caracteristicRow); } - addAttachments(id, batch.getIdAsInt(), ObjectTypeCode2.SAMPLE, attachmentRows); + addAttachments(id, batch.getIdAsInt(), ObjectTypeCode.SAMPLE, attachmentRows); } // export accidental catches @@ -536,7 +536,7 @@ public class MultiPostExportService extends AbstractTuttiService { rows.add(row); addFrequencies(id, batch.getId(), frequencyRows); - addAttachments(id, batch.getIdAsInt(), ObjectTypeCode2.BATCH, attachmentRows); + addAttachments(id, batch.getIdAsInt(), ObjectTypeCode.BATCH, attachmentRows); for (SpeciesBatch child : batch.getChildBatchs()) { createSpeciesRow(child, id, rows, frequencyRows, attachmentRows); @@ -566,7 +566,7 @@ public class MultiPostExportService extends AbstractTuttiService { rows.add(row); addFrequencies(id, batch.getId(), frequencyRows); - addAttachments(id, batch.getIdAsInt(), ObjectTypeCode2.BATCH, attachmentRows); + addAttachments(id, batch.getIdAsInt(), ObjectTypeCode.BATCH, attachmentRows); for (BenthosBatch child : batch.getChildBatchs()) { createBenthosRow(child, id, rows, frequencyRows, attachmentRows); @@ -598,7 +598,7 @@ public class MultiPostExportService extends AbstractTuttiService { protected void addAttachments(String batchId, int objectId, - ObjectTypeCode2 objectType, + ObjectTypeCode objectType, List<AttachmentRow> attachmentRows) { List<Attachment> attachments = persistenceService.getAllAttachments(objectType, objectId); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java index 922ba9e..c5756fb 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; @@ -209,7 +209,7 @@ public class MultiPostImportService extends AbstractTuttiService { importAttachments(tempDir, batches, notImportedBatches, - ObjectTypeCode2.BATCH); + ObjectTypeCode.BATCH); // Import weights @@ -475,7 +475,7 @@ public class MultiPostImportService extends AbstractTuttiService { importAttachments(tempDir, batches, notImportedBatches, - ObjectTypeCode2.BATCH); + ObjectTypeCode.BATCH); // Import weights @@ -734,7 +734,7 @@ public class MultiPostImportService extends AbstractTuttiService { importAttachments(tempDir, batches, notImportedBatches, - ObjectTypeCode2.BATCH); + ObjectTypeCode.BATCH); // Import weights @@ -902,7 +902,7 @@ public class MultiPostImportService extends AbstractTuttiService { // Import attachments - importAttachments(tempDir, batches, ObjectTypeCode2.SAMPLE); + importAttachments(tempDir, batches, ObjectTypeCode.SAMPLE); return null; } }; @@ -1059,7 +1059,7 @@ public class MultiPostImportService extends AbstractTuttiService { // Import attachments - importAttachments(tempDir, batches, ObjectTypeCode2.SAMPLE); + importAttachments(tempDir, batches, ObjectTypeCode.SAMPLE); return null; } }; @@ -1227,7 +1227,7 @@ public class MultiPostImportService extends AbstractTuttiService { protected <R extends TuttiEntity> void importAttachments(File directory, final Map<String, R> data, final Map<String, R> notImportedData, - ObjectTypeCode2 objectType) { + ObjectTypeCode objectType) { Function<AttachmentRow, Integer> getObjetcIdFunction = new Function<AttachmentRow, Integer>() { @Override @@ -1291,7 +1291,7 @@ public class MultiPostImportService extends AbstractTuttiService { protected <R extends TuttiEntity> void importAttachments(File directory, final Map<String, R> data, - ObjectTypeCode2 objectType) { + ObjectTypeCode objectType) { Function<AttachmentRow, Integer> getObjetcIdFunction = new Function<AttachmentRow, Integer>() { @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java index b8b0491..161c97c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/OperationExportRow.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.service.export.generic; */ import fr.ifremer.tutti.persistence.entities.CaracteristicMap; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -33,6 +32,7 @@ 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; @@ -239,7 +239,7 @@ public class OperationExportRow implements Serializable { } public String getDuration() { - return TuttiEntities.getDuration( + return DateTimes.getDuration( getGearShootingStartDate(), getGearShootingEndDate(), "mm"); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java index e22428e..1814b86 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java @@ -30,11 +30,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId2; -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; @@ -56,6 +55,8 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.type.WeightUnit; +import fr.ifremer.tutti.util.DateTimes; +import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -176,7 +177,7 @@ public class PsionImportService extends AbstractTuttiService { CaracteristicQualitativeValue maleCaracteristic = sexById.get(QualitativeValueId.SEX_MALE.getValue()); sexCaracteristicValues.put("M", maleCaracteristic); sexCaracteristicValues.put("m", maleCaracteristic); - CaracteristicQualitativeValue unkownCaracteristic = sexById.get(QualitativeValueId2.SEX_UNDEFINED.getValue()); + CaracteristicQualitativeValue unkownCaracteristic = sexById.get(QualitativeValueId.SEX_UNDEFINED.getValue()); sexCaracteristicValues.put("I", unkownCaracteristic); sexCaracteristicValues.put("i", unkownCaracteristic); } @@ -190,11 +191,11 @@ public class PsionImportService extends AbstractTuttiService { List<CaracteristicQualitativeValue> qualitativeValues = caracteristic.getQualitativeValue(); Map<Integer, CaracteristicQualitativeValue> byIds = TuttiEntities.splitByIdAsInt(qualitativeValues); - maturityCaracteristicValues.put("1", byIds.get(QualitativeValueId2.MATURITY_1.getValue())); - maturityCaracteristicValues.put("2", byIds.get(QualitativeValueId2.MATURITY_2.getValue())); - maturityCaracteristicValues.put("3", byIds.get(QualitativeValueId2.MATURITY_3.getValue())); - maturityCaracteristicValues.put("4", byIds.get(QualitativeValueId2.MATURITY_4.getValue())); - maturityCaracteristicValues.put("5", byIds.get(QualitativeValueId2.MATURITY_5.getValue())); + maturityCaracteristicValues.put("1", byIds.get(QualitativeValueId.MATURITY1.getValue())); + maturityCaracteristicValues.put("2", byIds.get(QualitativeValueId.MATURITY2.getValue())); + maturityCaracteristicValues.put("3", byIds.get(QualitativeValueId.MATURITY3.getValue())); + maturityCaracteristicValues.put("4", byIds.get(QualitativeValueId.MATURITY4.getValue())); + maturityCaracteristicValues.put("5", byIds.get(QualitativeValueId.MATURITY5.getValue())); } } @@ -307,6 +308,9 @@ public class PsionImportService extends AbstractTuttiService { Map<String, SpeciesProtocol> speciesProtocolBySurveyCode, Set<Species> alreadyUsedSpecies) throws IOException { + String operationNumber = String.valueOf(operation.getFishingOperationNumber()); + Date operationStartDate = DateTimes.getDay(operation.getGearShootingStartDate()); + BufferedReader reader = Files.newReader(importFile, Charsets.UTF_8); try { @@ -323,8 +327,8 @@ public class PsionImportService extends AbstractTuttiService { throw new IOException(t("tutti.service.psionimport.error.invalid.date.format")); } - boolean correctOperation = Objects.equals(operationCode, String.valueOf(operation.getFishingOperationNumber())) && - Objects.equals(operationDate, operation.getGearShootingStartDate()); + boolean correctOperation = Objects.equals(operationCode, operationNumber) && + Objects.equals(operationDate, operationStartDate); if (!correctOperation) { throw new IOException(t("tutti.service.psionimport.error.invalid.operation")); @@ -567,7 +571,7 @@ public class PsionImportService extends AbstractTuttiService { batchModel.getSpecies(), batchModel.getWeight(), batchModel.getSampleWeight(), - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), sortedCaracteristic); @@ -606,7 +610,7 @@ public class PsionImportService extends AbstractTuttiService { specy, sortedBatchWeight, null, - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), sortedCaracteristic); rootBatch = persistenceService.createSpeciesBatch(rootBatch, null); @@ -630,7 +634,7 @@ public class PsionImportService extends AbstractTuttiService { batchModel.getSpecies(), batchModel.getWeight(), batchModel.getSampleWeight(), - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), unsortedCaracteristic); batch = persistenceService.createSpeciesBatch(batch, null); @@ -645,7 +649,7 @@ public class PsionImportService extends AbstractTuttiService { specy, null, null, - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), unsortedCaracteristic); rootBatch = persistenceService.createSpeciesBatch(rootBatch, null); @@ -748,7 +752,7 @@ public class PsionImportService extends AbstractTuttiService { if (SIZE_CATEGORY_VALUES.contains(categoryCode)) { // size caracteristic - caracteristicId = PmfmId2.SIZE_CATEGORY.getValue(); + caracteristicId = PmfmId.SIZE_CATEGORY.getValue(); caracteristicQualitativeValue = sizeCaracteristicValues.get(categoryCode); result = new PsionImportBatchModel.SampleCategory(caracteristicId, caracteristicQualitativeValue); @@ -756,7 +760,7 @@ public class PsionImportService extends AbstractTuttiService { } else if (SEX_CATEGORY_VALUES.contains(categoryCode)) { // sex caracteristic - caracteristicId = PmfmId2.SEX.getValue(); + caracteristicId = PmfmId.SEX.getValue(); caracteristicQualitativeValue = sexCaracteristicValues.get(categoryCode); result = new PsionImportBatchModel.SampleCategory(caracteristicId, caracteristicQualitativeValue); @@ -764,7 +768,7 @@ public class PsionImportService extends AbstractTuttiService { } else if (MATURITY_CATEGORY_VALUES.contains(categoryCode)) { // maturity caracteristic - caracteristicId = PmfmId2.MATURITY.getValue(); + caracteristicId = PmfmId.MATURITY.getValue(); caracteristicQualitativeValue = maturityCaracteristicValues.get(categoryCode); result = new PsionImportBatchModel.SampleCategory(caracteristicId, caracteristicQualitativeValue); @@ -823,7 +827,7 @@ public class PsionImportService extends AbstractTuttiService { protected void addFileAsAttachment(File f, CatchBatch catchBatch) { Attachment attachment = Attachments.newAttachment(); - attachment.setObjectType(ObjectTypeCode2.CATCH_BATCH); + attachment.setObjectType(ObjectTypeCode.CATCH_BATCH); attachment.setObjectId(Integer.valueOf(catchBatch.getId())); attachment.setName(f.getName()); String date = DateFormat.getDateTimeInstance().format(context.currentDate()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java index 662d9c9..fede336 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java @@ -29,8 +29,8 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; @@ -193,7 +193,7 @@ public class PupitriImportExportService extends AbstractTuttiService { protected void addFileAsAttachment(File f, CatchBatch catchBatch) { Attachment attachment = Attachments.newAttachment(); - attachment.setObjectType(ObjectTypeCode2.CATCH_BATCH); + attachment.setObjectType(ObjectTypeCode.CATCH_BATCH); attachment.setObjectId(Integer.valueOf(catchBatch.getId())); attachment.setName(f.getName()); String date = DateFormat.getDateTimeInstance().format(context.currentDate()); @@ -396,7 +396,7 @@ public class PupitriImportExportService extends AbstractTuttiService { SpeciesBatch batch = createSpeciesBatch(operation, species, null, - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), cqv); batch = persistenceService.createSpeciesBatch(batch, null); @@ -436,7 +436,7 @@ public class PupitriImportExportService extends AbstractTuttiService { SpeciesBatch batch = createSpeciesBatch(operation, species, totalWeight, - PmfmId2.SORTED_UNSORTED.getValue(), + PmfmId.SORTED_UNSORTED.getValue(), cqv); persistenceService.createSpeciesBatch(batch, null); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java index 9d046b2..e2e0505 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java @@ -22,9 +22,8 @@ package fr.ifremer.tutti.service.pupitri; * #L% */ -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; -import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId2; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValues; @@ -42,12 +41,12 @@ public enum Signs { DEFAULT("0") { @Override public Integer getCategory() { - return PmfmId2.SEX.getValue(); + return PmfmId.SEX.getValue(); } @Override public Integer getQualitativeValueId() { - return QualitativeValueId2.SEX_UNDEFINED.getValue(); + return QualitativeValueId.SEX_UNDEFINED.getValue(); } }, UNSORTED("H") { @@ -66,7 +65,7 @@ public enum Signs { MALE("1") { @Override public Integer getCategory() { - return PmfmId2.SEX.getValue(); + return PmfmId.SEX.getValue(); } @Override @@ -77,7 +76,7 @@ public enum Signs { FEMALE("2") { @Override public Integer getCategory() { - return PmfmId2.SEX.getValue(); + return PmfmId.SEX.getValue(); } @Override @@ -88,7 +87,7 @@ public enum Signs { SMALL("P") { @Override public Integer getCategory() { - return PmfmId2.SIZE_CATEGORY.getValue(); + return PmfmId.SIZE_CATEGORY.getValue(); } @Override @@ -99,7 +98,7 @@ public enum Signs { MEDIUM("M") { @Override public Integer getCategory() { - return PmfmId2.SIZE_CATEGORY.getValue(); + return PmfmId.SIZE_CATEGORY.getValue(); } @Override @@ -110,7 +109,7 @@ public enum Signs { BIG("G") { @Override public Integer getCategory() { - return PmfmId2.SIZE_CATEGORY.getValue(); + return PmfmId.SIZE_CATEGORY.getValue(); } @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java index 80e6b0d..aad0f8c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java @@ -42,27 +42,49 @@ public class SpeciesRow implements Serializable { public static final String PROPERTY_SCIENTIFIC_NAME = "scientificName"; - protected final Species species; + protected final String codeFirstPart; + + protected final String codeSecondPart; + + protected final String scientificName; public SpeciesRow(Species species) { - Preconditions.checkNotNull(species.getSurveyCode(), + + String surveyCode = species.getSurveyCode(); + + Preconditions.checkNotNull(surveyCode, "Unable to export a species with a null survey code : " + species); - this.species = species; + + int signIndex = surveyCode.indexOf("-"); + + if (signIndex == -1) { + + // surveyCode is XXXXYYY + codeFirstPart = StringUtils.rightPad(StringUtils.substring(surveyCode, 0, 3), 4); + codeSecondPart = StringUtils.rightPad(StringUtils.substring(surveyCode, 3, 6), 3); + + } else { + + // surveycode is XXXX-YYY + codeFirstPart = StringUtils.rightPad(StringUtils.substring(surveyCode, 0, 4), 4); + codeSecondPart = StringUtils.rightPad(StringUtils.substring(surveyCode, 4, 7), 3); + + } + + scientificName = species.getName(); + } public String getCodeFirstPart() { - String codeFirstPart = StringUtils.substring(species.getSurveyCode(), 0, 4); - String result = StringUtils.rightPad(codeFirstPart, 4); - return result; + return codeFirstPart; } public String getCodeSecondPart() { - String codeSecondPart = StringUtils.substring(species.getSurveyCode(), 4, 7); - String result = StringUtils.rightPad(codeSecondPart, 3); - return result; + return codeSecondPart; } public String getScientificName() { - return species.getName(); + return scientificName; } + } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java index 4d105bd..fea1f19 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.service.psionimport; */ import com.google.common.base.Predicate; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.ProgressionModel; @@ -105,7 +105,7 @@ public class PsionImportServiceTest { dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_2_ID, OPERATION_1_ID, OPERATION_3_ID); - vracPredicate = SpeciesAbleBatchs.newSpeciesAbleBatchCategoryPredicate(PmfmId2.SORTED_UNSORTED.getValue(), QualitativeValueId.VRAC.getValue()); + vracPredicate = SpeciesAbleBatchs.newSpeciesAbleBatchCategoryPredicate(PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.VRAC.getValue()); } @Test diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java index 8008c44..554aef1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java @@ -91,10 +91,10 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); List<String> missingCategories = Lists.newArrayList(); - if (!sampleCategoryModel.containsCategoryId(PmfmId2.SIZE_CATEGORY.getValue())) { + if (!sampleCategoryModel.containsCategoryId(PmfmId.SIZE_CATEGORY.getValue())) { missingCategories.add("<li>" + persistenceService.getSizeCategoryCaracteristic().getParameterName() + "</li>"); } - if (!sampleCategoryModel.containsCategoryId(PmfmId2.SEX.getValue())) { + if (!sampleCategoryModel.containsCategoryId(PmfmId.SEX.getValue())) { missingCategories.add("<li>" + persistenceService.getSexCaracteristic().getParameterName() + "</li>"); } if (!missingCategories.isEmpty()) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIModel.java index 61e52b1..0cf0672 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIModel.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.ui.swing.content.category; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; +import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -79,7 +79,7 @@ public class EditSampleCategoryModelUIModel extends AbstractTuttiTableUIModel<Sa Preconditions.checkArgument(!category.isEmpty(), "need at least one first category (sorted-unsorted)"); this.caracteristicList = caracteristicList; this.firstCategory = category.get(0); - Preconditions.checkArgument(PmfmId2.SORTED_UNSORTED.getValue().equals(firstCategory.getCategoryId()), "first category must be sorted-unsorted caracteristic but was: " + firstCategory.getCategoryId()); + Preconditions.checkArgument(PmfmId.SORTED_UNSORTED.getValue().equals(firstCategory.getCategoryId()), "first category must be sorted-unsorted caracteristic but was: " + firstCategory.getCategoryId()); List<EditSampleCategoryModelRowModel> rows = Lists.newArrayList(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java index 795c24a..1e5bc6b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIModel.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content.cruise; */ import com.google.common.collect.Lists; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Cruises; @@ -209,8 +209,8 @@ public class EditCruiseUIModel extends AbstractTuttiBeanUIModel<Cruise, EditCrui //------------------------------------------------------------------------// @Override - public ObjectTypeCode2 getObjectType() { - return ObjectTypeCode2.SCIENTIFIC_CRUISE; + public ObjectTypeCode getObjectType() { + return ObjectTypeCode.SCIENTIFIC_CRUISE; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java index 8cbd3b1..c42a163 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java @@ -25,7 +25,9 @@ package fr.ifremer.tutti.ui.swing.content.operation; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import fr.ifremer.tutti.util.DateTimes; import fr.ifremer.tutti.util.Distances; +import org.nuiton.jaxx.application.ApplicationDataUtil; import org.nuiton.jaxx.application.swing.tab.TabHandler; import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -558,13 +560,13 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa public void setDate(ActionEvent event, String property) { JXDatePicker field = (JXDatePicker) event.getSource(); Date value = field.getDate(); - Date date = (Date) TuttiEntities.getProperty(getModel(), property); + Date date = (Date) ApplicationDataUtil.getProperty(getModel(), property); if (value != null && date != null) { Calendar cal = DateUtils.toCalendar(date); value = DateUtils.setHours(value, cal.get(Calendar.HOUR_OF_DAY)); value = DateUtils.setMinutes(value, cal.get(Calendar.MINUTE)); } - TuttiEntities.setProperty(getModel(), property, value); + ApplicationDataUtil.setProperty(getModel(), property, value); } //------------------------------------------------------------------------// @@ -724,7 +726,7 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa } public String getDuration(Date startDate, Date endDate) { - String duration = TuttiEntities.getDuration( + String duration = DateTimes.getDuration( startDate, endDate, t("tutti.editFishingOperation.duration.format") diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java index bcfeda2..4f8adac 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content.operation; */ import com.google.common.collect.Lists; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -969,8 +969,8 @@ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<Fishin //------------------------------------------------------------------------// @Override - public ObjectTypeCode2 getObjectType() { - return ObjectTypeCode2.OPERATION; + public ObjectTypeCode getObjectType() { + return ObjectTypeCode.OPERATION; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java index d6b10bc..b277c13 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java @@ -26,7 +26,7 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.CatchBatchs; @@ -779,8 +779,8 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi //------------------------------------------------------------------------// @Override - public ObjectTypeCode2 getObjectType() { - return ObjectTypeCode2.CATCH_BATCH; + public ObjectTypeCode getObjectType() { + return ObjectTypeCode.CATCH_BATCH; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java index 526cee8..ae416b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental; */ import com.google.common.collect.Lists; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatchs; @@ -257,8 +257,8 @@ public class AccidentalBatchRowModel extends AbstractTuttiBeanUIModel<Accidental //------------------------------------------------------------------------// @Override - public ObjectTypeCode2 getObjectType() { - return ObjectTypeCode2.SAMPLE; + public ObjectTypeCode getObjectType() { + return ObjectTypeCode.SAMPLE; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java index ee97522..2c37c2c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java @@ -24,8 +24,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -42,6 +41,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import org.apache.commons.collections4.CollectionUtils; +import org.nuiton.jaxx.application.ApplicationDataUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -499,8 +499,8 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, public void setSampleCategoryValue(Integer sampleCategoryId, Serializable value) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - TuttiEntities.setProperty(sampleCategory, - SampleCategory.PROPERTY_CATEGORY_VALUE, value); + ApplicationDataUtil.setProperty(sampleCategory, + SampleCategory.PROPERTY_CATEGORY_VALUE, value); firePropertyChange(PROPERTY_SAMPLE_CATEGORY_VALUE, null, sampleCategory); } @@ -508,8 +508,8 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, public void setSampleCategoryWeight(Integer sampleCategoryId, Object value) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - TuttiEntities.setProperty(sampleCategory, - SampleCategory.PROPERTY_CATEGORY_WEIGHT, value); + ApplicationDataUtil.setProperty(sampleCategory, + SampleCategory.PROPERTY_CATEGORY_WEIGHT, value); firePropertyChange(PROPERTY_SAMPLE_CATEGORY_WEIGHT, null, sampleCategory); } @@ -555,8 +555,8 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, //------------------------------------------------------------------------// @Override - public ObjectTypeCode2 getObjectType() { - return ObjectTypeCode2.BATCH; + public ObjectTypeCode getObjectType() { + return ObjectTypeCode.BATCH; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java index 05f0097..95457bd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservatio */ import com.google.common.collect.Lists; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -271,8 +271,8 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel //------------------------------------------------------------------------// @Override - public ObjectTypeCode2 getObjectType() { - return ObjectTypeCode2.SAMPLE; + public ObjectTypeCode getObjectType() { + return ObjectTypeCode.SAMPLE; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java index 94ab5d9..6a318e6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java @@ -49,6 +49,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.ApplicationDataUtil; import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.JComponent; @@ -230,7 +231,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa @Override public void keyReleased(KeyEvent e) { String value = textField.getText(); - TuttiEntities.setProperty(editorModel, CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, value); + ApplicationDataUtil.setProperty(editorModel, CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, value); } }); editor = textField; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java index cc60055..118043f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter; */ import com.google.common.collect.Lists; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; @@ -204,8 +204,8 @@ public class MarineLitterBatchRowModel extends AbstractTuttiBeanUIModel<MarineLi //------------------------------------------------------------------------// @Override - public ObjectTypeCode2 getObjectType() { - return ObjectTypeCode2.BATCH; + public ObjectTypeCode getObjectType() { + return ObjectTypeCode.BATCH; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java index 86b6a42..4520493 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java @@ -24,8 +24,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; @@ -42,6 +41,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import org.apache.commons.collections4.CollectionUtils; +import org.nuiton.jaxx.application.ApplicationDataUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -489,8 +489,8 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, public void setSampleCategoryValue(Integer sampleCategoryId, Serializable value) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - TuttiEntities.setProperty(sampleCategory, - SampleCategory.PROPERTY_CATEGORY_VALUE, value); + ApplicationDataUtil.setProperty(sampleCategory, + SampleCategory.PROPERTY_CATEGORY_VALUE, value); firePropertyChange(PROPERTY_SAMPLE_CATEGORY_VALUE, null, sampleCategory); } @@ -498,8 +498,8 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, public void setSampleCategoryWeight(Integer sampleCategoryId, Object value) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - TuttiEntities.setProperty(sampleCategory, - SampleCategory.PROPERTY_CATEGORY_WEIGHT, value); + ApplicationDataUtil.setProperty(sampleCategory, + SampleCategory.PROPERTY_CATEGORY_WEIGHT, value); firePropertyChange(PROPERTY_SAMPLE_CATEGORY_WEIGHT, null, sampleCategory); } @@ -545,8 +545,8 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, //------------------------------------------------------------------------// @Override - public ObjectTypeCode2 getObjectType() { - return ObjectTypeCode2.BATCH; + public ObjectTypeCode getObjectType() { + return ObjectTypeCode.BATCH; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java index 03517b8..7199bfd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentModelAware.java @@ -22,7 +22,7 @@ package fr.ifremer.tutti.ui.swing.util.attachment; * #L% */ -import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; +import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.data.Attachment; import java.io.Serializable; @@ -41,7 +41,7 @@ public interface AttachmentModelAware extends Serializable { String PROPERTY_OBJECT_ID = "objectId"; - ObjectTypeCode2 getObjectType(); + ObjectTypeCode getObjectType(); Integer getObjectId(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.