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 bd797e88178bac4118b3bdebb40e8ffa729169cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 12:58:33 2015 +0100 optimize imports --- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ++-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../tutti/persistence/RessourceClassLoader.java | 4 ++-- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +++--- .../entities/data/FishingOperations.java | 3 +++ .../entities/protocol/CaracteristicType.java | 7 +------ .../entities/protocol/v1/SpeciesProtocol1.java | 2 -- .../entities/protocol/v2/TuttiProtocolBean2.java | 24 +++++++++++----------- .../referential/GearWithOriginalRankOrders.java | 2 +- .../persistence/entities/referential/Speciess.java | 2 +- .../service/CatchBatchPersistenceServiceImpl.java | 2 +- .../service/CruisePersistenceService.java | 2 +- .../FishingOperationPersistenceServiceImpl.java | 2 +- .../service/ReferentialPersistenceService.java | 22 ++++++++++---------- .../service/ReferentialPersistenceServiceImpl.java | 2 -- .../SpeciesBatchPersistenceServiceImpl.java | 1 - .../referential/PersonPersistenceService.java | 4 ++-- .../java/fr/ifremer/tutti/type/WeightUnit.java | 2 +- 18 files changed, 43 insertions(+), 50 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index d042a24..68875b1 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -230,11 +230,11 @@ public class TuttiConfiguration extends ApplicationConfiguration { } public File newTempFile(String basename) { - return newTempFile(basename ,""); + return newTempFile(basename, ""); } public File newTempFile(String basename, String extension) { - return new File(getTmpDirectory(), basename + "_" + System.nanoTime()+extension); + return new File(getTmpDirectory(), basename + "_" + System.nanoTime() + extension); } public boolean isDbExists() { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 1535075..193463c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -22,9 +22,9 @@ package fr.ifremer.tutti; * #L% */ +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import org.hibernate.dialect.HSQLDialect; import org.hsqldb.jdbcDriver; import org.nuiton.config.ConfigOptionDef; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java index 95c8ade..7a401ea 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java @@ -26,11 +26,11 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; -import org.nuiton.jaxx.application.ApplicationIOUtil; -import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.File; import java.io.IOException; 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 a9fbad4..d90c0cc 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 @@ -395,7 +395,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { public List<TuttiLocation> getAllFishingOperationSubStrata(String zoneId, String strataId) { return locationService.getAllFishingOperationSubStrata(zoneId, - strataId); + strataId); } @Override @@ -403,8 +403,8 @@ public class TuttiPersistenceImpl implements TuttiPersistence { String strataId, String subStrataId) { return locationService.getAllFishingOperationLocation(zoneId, - strataId, - subStrataId); + strataId, + subStrataId); } @Override diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java index 2ac6f1e..efbebe4 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java @@ -30,8 +30,11 @@ import javax.annotation.Generated; public class FishingOperations extends AbstractFishingOperations { public static final String PROPERTY_GEAR_SHOOTING_START_DAY = "gearShootingStartDay"; + public static final String PROPERTY_GEAR_SHOOTING_START_TIME = "gearShootingStartTime"; + public static final String PROPERTY_GEAR_SHOOTING_END_DAY = "gearShootingEndDay"; + public static final String PROPERTY_GEAR_SHOOTING_END_TIME = "gearShootingEndTime"; } //FishingOperations diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicType.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicType.java index f93a4b8..8315222 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicType.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicType.java @@ -22,11 +22,6 @@ package fr.ifremer.tutti.persistence.entities.protocol; * #L% */ -import fr.ifremer.tutti.LabelAware; - -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** * To define which caracteristic can be imported. * @@ -41,7 +36,7 @@ public enum CaracteristicType { INDIVIDUAL_OBSERVATION; public static CaracteristicType[] getTabTypes() { - return new CaracteristicType[] { + return new CaracteristicType[]{ VESSEL_USE_FEATURE, GEAR_USE_FEATURE }; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocol1.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocol1.java index b23222d..d09f03e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocol1.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/SpeciesProtocol1.java @@ -25,8 +25,6 @@ package fr.ifremer.tutti.persistence.entities.protocol.v1; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import javax.annotation.Generated; -import java.util.Collection; -import java.util.List; /** * To migrate old species protocol to last version. diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java index 81fed6a..20fa69c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java @@ -109,7 +109,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - boolean removed = getGearUseFeaturePmfmId().removeAll(gearUseFeaturePmfmId); + boolean removed = getGearUseFeaturePmfmId().removeAll(gearUseFeaturePmfmId); return removed; } @@ -121,7 +121,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean containsAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - boolean contains = getGearUseFeaturePmfmId().containsAll(gearUseFeaturePmfmId); + boolean contains = getGearUseFeaturePmfmId().containsAll(gearUseFeaturePmfmId); return contains; } @@ -172,7 +172,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - boolean removed = getVesselUseFeaturePmfmId().removeAll(vesselUseFeaturePmfmId); + boolean removed = getVesselUseFeaturePmfmId().removeAll(vesselUseFeaturePmfmId); return removed; } @@ -184,7 +184,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean containsAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - boolean contains = getVesselUseFeaturePmfmId().containsAll(vesselUseFeaturePmfmId); + boolean contains = getVesselUseFeaturePmfmId().containsAll(vesselUseFeaturePmfmId); return contains; } @@ -235,7 +235,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - boolean removed = getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); + boolean removed = getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); return removed; } @@ -247,7 +247,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - boolean contains = getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); + boolean contains = getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); return contains; } @@ -298,7 +298,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { - boolean removed = getIndividualObservationPmfmId().removeAll(individualObservationPmfmId); + boolean removed = getIndividualObservationPmfmId().removeAll(individualObservationPmfmId); return removed; } @@ -310,7 +310,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean containsAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { - boolean contains = getIndividualObservationPmfmId().containsAll(individualObservationPmfmId); + boolean contains = getIndividualObservationPmfmId().containsAll(individualObservationPmfmId); return contains; } @@ -371,7 +371,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeAllSpecies(Collection<SpeciesProtocol> species) { - boolean removed = getSpecies().removeAll(species); + boolean removed = getSpecies().removeAll(species); return removed; } @@ -383,7 +383,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean containsAllSpecies(Collection<SpeciesProtocol> species) { - boolean contains = getSpecies().containsAll(species); + boolean contains = getSpecies().containsAll(species); return contains; } @@ -434,7 +434,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeAllBenthos(Collection<SpeciesProtocol> benthos) { - boolean removed = getBenthos().removeAll(benthos); + boolean removed = getBenthos().removeAll(benthos); return removed; } @@ -446,7 +446,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean containsAllBenthos(Collection<SpeciesProtocol> benthos) { - boolean contains = getBenthos().containsAll(benthos); + boolean contains = getBenthos().containsAll(benthos); return contains; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java index f9ee59d..37d7b9d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java @@ -39,7 +39,7 @@ public class GearWithOriginalRankOrders extends AbstractGearWithOriginalRankOrde public static <BeanType extends GearWithOriginalRankOrder> BeanType newGearWithOriginalRankOrder(Gear source) { Class<BeanType> sourceType = typeOfGearWithOriginalRankOrder(); - Binder<Gear,BeanType> binder = BinderFactory.newBinder(Gear.class, sourceType); + Binder<Gear, BeanType> binder = BinderFactory.newBinder(Gear.class, sourceType); BeanType result = (BeanType) newGearWithOriginalRankOrder(); binder.copy(source, result); return result; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java index 4c21a37..fc547d8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java @@ -99,7 +99,7 @@ public class Speciess extends AbstractSpeciess { } }; - public static final Function<Species, String> GET_NAME= new Function<Species, String>() { + public static final Function<Species, String> GET_NAME = new Function<Species, String>() { @Override public String apply(Species input) { return input.getName(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java index 2bf6a84..d48dbbb 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java @@ -371,7 +371,7 @@ public class CatchBatchPersistenceServiceImpl if (source.getCatchTotalWeight() == null) { QuantificationMeasurement quantificationMeasurement = measurementPersistenceHelper.getWeightMeasurementQuantificationMeasurement(target); - if (quantificationMeasurement!=null) { + if (quantificationMeasurement != null) { // remove it measurementPersistenceHelper.removeWeightMeasurementQuantificationMeasurement(target, quantificationMeasurement); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java index 06b2625..15c5ada 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java @@ -51,7 +51,7 @@ public interface CruisePersistenceService extends TuttiPersistenceServiceImpleme Cruise saveCruise(Cruise bean, boolean updateVessel, boolean updateGear); @Transactional(readOnly = false) - void setCruiseReadyToSynch(Integer cruiseId) ; + void setCruiseReadyToSynch(Integer cruiseId); CaracteristicMap getGearCaracteristics(String cruiseId, String gearId, short rankOrder); 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 b5ed378..479e8b6 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 @@ -654,7 +654,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS // Trawl distance if (PmfmId.TRAWL_DISTANCE.getValue().equals(pmfmId)) { - result.setTrawlDistance(numericalValue==null?null:numericalValue.intValue()); + result.setTrawlDistance(numericalValue == null ? null : numericalValue.intValue()); } // Rectilinear operation ? diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java index 4bdcc19..0ff41b0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java @@ -340,8 +340,8 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm */ @Transactional(readOnly = false) @CacheEvict(value = {"fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", - "species", "referentSpecies", "referentSpeciesById", "referentSpeciesByIdVernacular"}, - allEntries = true) + "species", "referentSpecies", "referentSpeciesById", "referentSpeciesByIdVernacular"}, + allEntries = true) void replaceSpecies(Species source, Species target, boolean delete); /** @@ -355,7 +355,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm */ @Transactional(readOnly = false) @CacheEvict(value = {"fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", "persons", "personById"}, - allEntries = true) + allEntries = true) void replacePerson(Person source, Person target, boolean delete); /** @@ -369,7 +369,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm */ @Transactional(readOnly = false) @CacheEvict(value = {"fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", "fishingVessels", "vesselByCode"}, - allEntries = true) + allEntries = true) void replaceVessel(Vessel source, Vessel target, boolean delete); /** @@ -386,7 +386,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm /** * Delete the temporary gears with the given {@code idss}. * - * @param ids ids of the gears to remove + * @param ids ids of the gears to remove * @param checkIfUsed to check if gear is used before trying to delete it * @since 3.8 */ @@ -430,7 +430,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm /** * Delete the temporary persons with the given {@code ids}. * - * @param ids ids of the persons to remove + * @param ids ids of the persons to remove * @param checkIfUsed to check if person is used before trying to delete it * @since 3.8 */ @@ -452,7 +452,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm /** * Delete the temporary vessels with the given {@code codes}. * - * @param codes code of the vessels to remove + * @param codes code of the vessels to remove * @param checkIfUsed to check if vessel is used before trying to delete it * @since 3.8 */ @@ -463,7 +463,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm /** * Check if the temporary person with the given {@code id} is used. * - * @param id id of the person to check + * @param id id of the person to check * @since 3.8 */ boolean isTemporaryPersonUsed(Integer id); @@ -471,7 +471,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm /** * Check if the temporary species with the given {@code id} is used. * - * @param id id of the species to check + * @param id id of the species to check * @since 3.8 */ boolean isTemporarySpeciesUsed(Integer id); @@ -479,7 +479,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm /** * Check if the temporary gear with the given {@code id} is used. * - * @param id id of the gear to remove + * @param id id of the gear to remove * @since 3.8 */ boolean isTemporaryGearUsed(Integer id); @@ -487,7 +487,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm /** * Check if the temporary vessel with the given {@code id} is used. * - * @param code code of the vessel to remove + * @param code code of the vessel to remove * @since 3.8 */ boolean isTemporaryVesselUsed(String code); 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 d1042c8..dce2f35 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 @@ -34,7 +34,6 @@ import fr.ifremer.adagio.core.dao.data.vessel.VesselExtendDao; import fr.ifremer.adagio.core.dao.referential.StatusCode; import fr.ifremer.adagio.core.dao.referential.StatusDao; import fr.ifremer.adagio.core.dao.referential.VesselTypeId; -import fr.ifremer.adagio.core.dao.referential.gear.FishingGear; import fr.ifremer.adagio.core.dao.referential.gear.FishingGearExtendDao; import fr.ifremer.adagio.core.dao.referential.gear.GearClassification; import fr.ifremer.adagio.core.dao.referential.gear.GearClassificationId; @@ -92,7 +91,6 @@ import javax.annotation.Resource; import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java index 1f54f3b..c91d502 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java @@ -39,7 +39,6 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequencys; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchs; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.persistence.service.referential.CaracteristicPersistenceService; import fr.ifremer.tutti.persistence.service.referential.SpeciesPersistenceService; import fr.ifremer.tutti.persistence.service.util.BatchPersistenceHelper; import fr.ifremer.tutti.persistence.service.util.BatchTreeHelper; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java index e25c6aa..7d51ee8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java @@ -83,7 +83,7 @@ public interface PersonPersistenceService extends TuttiPersistenceServiceImpleme /** * Delete the temporary persons with the given {@code ids}. * - * @param ids ids of the persons to remove + * @param ids ids of the persons to remove * @since 3.8 */ @Transactional(readOnly = false) @@ -93,7 +93,7 @@ public interface PersonPersistenceService extends TuttiPersistenceServiceImpleme /** * Delete the temporary person with the given {@code id}. * - * @param id id of the person to remove + * @param id id of the person to remove * @since 3.8 */ @Transactional(readOnly = false) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java index f17bbee..2340d58 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java @@ -25,8 +25,8 @@ package fr.ifremer.tutti.type; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; -import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Different types of weight unit. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.